diff options
Diffstat (limited to 'security/nss/nss.gyp')
| -rw-r--r-- | security/nss/nss.gyp | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/security/nss/nss.gyp b/security/nss/nss.gyp index 44551d448d..e62d28449d 100644 --- a/security/nss/nss.gyp +++ b/security/nss/nss.gyp @@ -59,7 +59,8 @@ 'lib/smime/smime.gyp:smime', 'lib/softoken/softoken.gyp:softokn', 'lib/ssl/ssl.gyp:ssl', - 'lib/util/util.gyp:nssutil' + 'lib/util/util.gyp:nssutil', + 'lib/libpkix/libpkix.gyp:libpkix', ], 'conditions': [ [ 'OS=="linux"', { @@ -73,21 +74,6 @@ 'lib/softoken/legacydb/legacydb.gyp:nssdbm', ], }], - [ 'disable_libpkix==0', { - 'dependencies': [ - 'lib/libpkix/pkix/certsel/certsel.gyp:pkixcertsel', - 'lib/libpkix/pkix/checker/checker.gyp:pkixchecker', - 'lib/libpkix/pkix/crlsel/crlsel.gyp:pkixcrlsel', - 'lib/libpkix/pkix/params/params.gyp:pkixparams', - 'lib/libpkix/pkix/results/results.gyp:pkixresults', - 'lib/libpkix/pkix/store/store.gyp:pkixstore', - 'lib/libpkix/pkix/top/top.gyp:pkixtop', - 'lib/libpkix/pkix/util/util.gyp:pkixutil', - 'lib/libpkix/pkix_pl_nss/module/module.gyp:pkixmodule', - 'lib/libpkix/pkix_pl_nss/pki/pki.gyp:pkixpki', - 'lib/libpkix/pkix_pl_nss/system/system.gyp:pkixsystem', - ], - }], [ 'use_system_sqlite==0', { 'dependencies': [ 'lib/sqlite/sqlite.gyp:sqlite', @@ -120,6 +106,7 @@ 'cmd/smimetools/smimetools.gyp:cmsutil', 'cmd/ssltap/ssltap.gyp:ssltap', 'cmd/symkeyutil/symkeyutil.gyp:symkeyutil', + 'nss-tool/nss_tool.gyp:nss', ], }], ], @@ -176,13 +163,14 @@ 'cmd/tstclnt/tstclnt.gyp:tstclnt', 'cmd/vfychain/vfychain.gyp:vfychain', 'cmd/vfyserv/vfyserv.gyp:vfyserv', - 'gtests/google_test/google_test.gyp:gtest1', - 'gtests/common/common.gyp:gtests', + 'gtests/certhigh_gtest/certhigh_gtest.gyp:certhigh_gtest', 'gtests/der_gtest/der_gtest.gyp:der_gtest', + 'gtests/certdb_gtest/certdb_gtest.gyp:certdb_gtest', + 'gtests/freebl_gtest/freebl_gtest.gyp:prng_gtest', 'gtests/pk11_gtest/pk11_gtest.gyp:pk11_gtest', 'gtests/ssl_gtest/ssl_gtest.gyp:ssl_gtest', 'gtests/util_gtest/util_gtest.gyp:util_gtest', - 'gtests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim' + 'gtests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim', ], 'conditions': [ [ 'OS=="linux"', { @@ -241,7 +229,7 @@ }, ], }], - [ 'fuzz==1', { + [ 'fuzz_tls==1', { 'targets': [ { 'target_name': 'fuzz_warning', @@ -256,12 +244,16 @@ } ], }, + ], + }], + [ 'fuzz==1', { + 'targets': [ { 'target_name': 'fuzz', 'type': 'none', 'dependencies': [ 'fuzz/fuzz.gyp:nssfuzz', - ] + ], }, ], }], |