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 /base | |
| 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 'base')
| -rw-r--r-- | base/base.gypi | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/base/base.gypi b/base/base.gypi index 0c702bd..a395299 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -539,11 +539,37 @@ ], },], [ 'use_openssl==1', { + # TODO(joth): Use a glob to match exclude patterns once the + # OpenSSL file set is complete. 'sources!': [ + 'crypto/encryptor_nss.cc', + 'crypto/rsa_private_key_nss.cc', + 'crypto/signature_creator_nss.cc', + 'crypto/signature_verifier_nss.cc', + 'crypto/symmetric_key_nss.cc', + 'hmac_nss.cc', + 'nss_util.cc', + 'nss_util.h', # Note that sha2.cc depends on the NSS files bundled into # chromium; it does not have the _nss postfix as it is required # on platforms besides linux and *bsd. 'sha2.cc', + 'third_party/nss/blapi.h', + 'third_party/nss/blapit.h', + 'third_party/nss/sha256.h', + 'third_party/nss/sha512.cc', + ], + }, { + 'sources!': [ + 'crypto/encryptor_openssl.cc', + 'crypto/rsa_private_key_openssl.cc', + 'crypto/signature_creator_openssl.cc', + 'crypto/signature_verifier_openssl.cc', + 'crypto/symmetric_key_openssl.cc', + 'hmac_openssl.cc', + 'openssl_util.cc', + 'openssl_util.h', + 'sha2_openssl.cc', ], },], ], |