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

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: Created 5 years, 11 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
Index: chrome/chrome_utility.gypi
diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi
index eb9e7c6517b0445b5108dea7bf7f3fdc642a7ebf..c82e937513c5eb1e3dbd11bbc6824f998e7003ee 100644
--- a/chrome/chrome_utility.gypi
+++ b/chrome/chrome_utility.gypi
@@ -120,12 +120,12 @@
'<@(chrome_utility_sources)',
],
'conditions': [
- ['OS!="win" and OS!="mac" and use_openssl==1', {
- 'sources!': [
- 'utility/importer/nss_decryptor.cc',
- ]
+ ['OS!="android"', {
+ 'sources': [
+ '<@(chrome_utility_importer_sources)',
+ ],
}],
- ['OS!="win" and OS!="mac" and use_openssl==0', {
+ ['use_nss==1', {
'dependencies': [
'../crypto/crypto.gyp:crypto',
],
@@ -134,11 +134,6 @@
'utility/importer/nss_decryptor_system_nss.h',
],
}],
- ['OS!="android"', {
- 'sources': [
- '<@(chrome_utility_importer_sources)',
- ],
- }],
['enable_extensions==1', {
'dependencies': [
'../extensions/extensions.gyp:extensions_utility',

Powered by Google App Engine
This is Rietveld 408576698