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

Unified Diff: chrome/chrome_utility.gypi

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 | « chrome/chrome_common.gypi ('k') | chrome/common/net/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_utility.gypi
diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi
index d076a1b933d618921d1650b040d9f5b03d27466c..08d58b24aa2ce3433f541722a08d7bd06be61af2 100644
--- a/chrome/chrome_utility.gypi
+++ b/chrome/chrome_utility.gypi
@@ -133,26 +133,21 @@
},
},
}],
- ['OS!="win" and OS!="mac" and use_openssl==1', {
- 'sources!': [
- 'utility/importer/nss_decryptor.cc',
- ]
- }],
- ['OS!="win" and OS!="mac" and use_openssl==0', {
+ ['OS!="android"', {
'dependencies': [
- '../crypto/crypto.gyp:crypto',
+ '../net/net.gyp:net_utility_services',
],
'sources': [
- 'utility/importer/nss_decryptor_system_nss.cc',
- 'utility/importer/nss_decryptor_system_nss.h',
+ '<@(chrome_utility_importer_sources)',
],
}],
- ['OS!="android"', {
+ ['use_nss_certs==1', {
'dependencies': [
- '../net/net.gyp:net_utility_services',
+ '../crypto/crypto.gyp:crypto',
],
'sources': [
- '<@(chrome_utility_importer_sources)',
+ 'utility/importer/nss_decryptor_system_nss.cc',
+ 'utility/importer/nss_decryptor_system_nss.h',
],
}],
['OS=="android" and use_seccomp_bpf==1', {
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/common/net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698