summaryrefslogtreecommitdiff
path: root/nss/nss.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'nss/nss.gyp')
-rw-r--r--nss/nss.gyp16
1 files changed, 11 insertions, 5 deletions
diff --git a/nss/nss.gyp b/nss/nss.gyp
index 44551d4..97586b3 100644
--- a/nss/nss.gyp
+++ b/nss/nss.gyp
@@ -120,6 +120,7 @@
'cmd/smimetools/smimetools.gyp:cmsutil',
'cmd/ssltap/ssltap.gyp:ssltap',
'cmd/symkeyutil/symkeyutil.gyp:symkeyutil',
+ 'nss-tool/nss_tool.gyp:nss',
],
}],
],
@@ -176,13 +177,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 +243,7 @@
},
],
}],
- [ 'fuzz==1', {
+ [ 'fuzz_tls==1', {
'targets': [
{
'target_name': 'fuzz_warning',
@@ -256,12 +258,16 @@
}
],
},
+ ],
+ }],
+ [ 'fuzz==1', {
+ 'targets': [
{
'target_name': 'fuzz',
'type': 'none',
'dependencies': [
'fuzz/fuzz.gyp:nssfuzz',
- ]
+ ],
},
],
}],