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 /net/net.gyp | |
| 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 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index e983ff1..a2aff3b 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -266,8 +266,13 @@ ], [ 'use_openssl==1', { 'sources!': [ + 'base/cert_database_nss.cc', 'base/dnssec_keyset.cc', 'base/dnssec_keyset.h', + 'base/keygen_handler_nss.cc', + 'base/nss_memio.c', + 'base/nss_memio.h', + 'base/x509_certificate_nss.cc', 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 'third_party/mozilla_security_manager/nsKeygenHandler.h', 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', @@ -278,6 +283,17 @@ 'third_party/mozilla_security_manager/nsPKCS12Blob.h', ], }, + { # else: not using openssl. + 'sources!': [ + 'base/cert_database_openssl.cc', + 'base/keygen_handler_openssl.cc', + 'base/openssl_util.cc', + 'base/openssl_util.h', + 'base/x509_certificate_openssl.cc', + 'base/x509_openssl_util.cc', + 'base/x509_openssl_util.h', + ], + }, ], [ 'OS == "win"', { 'dependencies': [ @@ -708,8 +724,20 @@ }], ['use_openssl==1', { 'sources!': [ + 'ocsp/nss_ocsp.cc', + 'ocsp/nss_ocsp.h', 'socket/dns_cert_provenance_check.cc', 'socket/dns_cert_provenance_check.h', + 'socket/ssl_client_socket_nss.cc', + 'socket/ssl_client_socket_nss.h', + 'socket/ssl_client_socket_nss_factory.cc', + 'socket/ssl_client_socket_nss_factory.h', + ], + }, + { # else !use_openssl: remove the unneeded files + 'sources!': [ + 'socket/ssl_client_socket_openssl.cc', + 'socket/ssl_client_socket_openssl.h', ], }, ], |