diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 16:08:10 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 16:08:10 +0000 |
| commit | 5f7e5cb2c0288ad051ab7229a2f6c8d97b15dfdc (patch) | |
| tree | e2d27f26cd3c209f61d0d5038804672eb9a8dc97 /build | |
| parent | 5d10081cdc1162f897d9301afadb4981206ba974 (diff) | |
| download | chromium_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 'build')
| -rw-r--r-- | build/common.gypi | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/build/common.gypi b/build/common.gypi index f9e774a..02b99c7 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -653,18 +653,6 @@ ['toolkit_views==0', { 'sources/': [ ['exclude', '_views\\.cc$'] ] }], - ['use_openssl==1', { - 'sources/': [ - ['exclude', '_nss\\.(cc|c)$'], - ['exclude', '/nss/'], - ['exclude', '(/|_|^)nss_[^/]*\\.(cc|c)$'], - ], - }, { - 'sources/': [ - ['exclude', '_openssl\\.cc$'], - ['exclude', '(/|_|^)openssl_[^/]*\\.cc$'], - ], - }], ], }], ], # target_conditions for 'target_defaults' |