Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1333)

Unified Diff: net/net.gyp

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cert/x509_util_nss_certs.cc ('k') | net/net.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 9dacd4387148d4e31cec95209a7e32fad121a3e4..2caae5ac19b2fe653735598b9cba539fb0923752 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -180,6 +180,9 @@
}],
[ 'use_nss_certs != 1', {
'sources!': [
+ 'cert/nss_cert_database_unittest.cc',
+ 'cert/nss_cert_database_chromeos_unittest.cc',
+ 'cert/nss_profile_filter_chromeos_unittest.cc',
'ssl/client_cert_store_chromeos_unittest.cc',
'ssl/client_cert_store_nss_unittest.cc',
],
@@ -189,7 +192,8 @@
'dependencies': [
'../third_party/boringssl/boringssl.gyp:boringssl',
],
- }, { # use_openssl == 0
+ }],
+ [ 'use_nss_certs == 1 or OS == "ios" or use_openssl == 0', {
'conditions': [
[ 'desktop_linux == 1 or chromeos == 1', {
'dependencies': [
@@ -201,9 +205,6 @@
'../third_party/nss/nss.gyp:nss',
'third_party/nss/ssl.gyp:libssl',
],
- 'sources!': [
- 'cert/nss_cert_database_unittest.cc',
- ],
}],
],
}],
@@ -241,9 +242,6 @@
# TODO(bulach): Add equivalent tests when the underlying
# functionality is ported to OpenSSL.
'sources!': [
- 'cert/nss_cert_database_chromeos_unittest.cc',
- 'cert/nss_cert_database_unittest.cc',
- 'cert/nss_profile_filter_chromeos_unittest.cc',
'cert/x509_util_nss_unittest.cc',
'quic/test_tools/crypto_test_utils_nss.cc',
],
« no previous file with comments | « net/cert/x509_util_nss_certs.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698