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

Unified Diff: chrome/chrome_browser.gypi

Issue 3855004: Make USE_OPENSSL and USE_NSS mutually exclusive (Closed)
Patch Set: wtc comments Created 10 years, 2 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/browser/sync/util/nigori.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index fe756da0a6190401a69ad45cdc2881808231d85a..5442202404b7065bcbbd90450bd5c87489437da3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4073,6 +4073,13 @@
'browser/importer/ie_importer.cc',
],
}],
+ [ 'use_openssl==1', {
+ 'sources!': [
+ 'browser/importer/nss_decryptor.cc',
+ 'browser/importer/nss_decryptor_system_nss.cc',
+ 'browser/importer/nss_decryptor_system_nss.h',
+ ],
+ }],
],
},
{
« no previous file with comments | « chrome/browser/sync/util/nigori.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698