summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-15 16:08:10 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-15 16:08:10 +0000
commit5f7e5cb2c0288ad051ab7229a2f6c8d97b15dfdc (patch)
treee2d27f26cd3c209f61d0d5038804672eb9a8dc97 /chrome
parent5d10081cdc1162f897d9301afadb4981206ba974 (diff)
downloadchromium_src-5f7e5cb2c0288ad051ab7229a2f6c8d97b15dfdc.zip
chromium_src-5f7e5cb2c0288ad051ab7229a2f6c8d97b15dfdc.tar.gz
chromium_src-5f7e5cb2c0288ad051ab7229a2f6c8d97b15dfdc.tar.bz2
Reverted because openssl_helper needs to build even on non-openssl builds
Revert 66120 - Simplify gyp files by adding a global glob for openssl/nss BUG=None TEST=Build Review URL: http://codereview.chromium.org/4799003 TBR=joth@chromium.org Review URL: http://codereview.chromium.org/5014001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome_browser.gypi7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 75b07b5..5fbfc91 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4188,6 +4188,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',
+ ],
+ }],
],
},
{