diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 12:44:40 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 12:44:40 +0000 |
| commit | b1c2a554239ab3be950f0d19581945eb115e7a6c (patch) | |
| tree | 5688a12bb881cd14c5ed80d0ccbdf2208248f45c /net/net.gyp | |
| parent | 2a73485bfae7e697df34e6640b1593ccafe2cf53 (diff) | |
| download | chromium_src-b1c2a554239ab3be950f0d19581945eb115e7a6c.zip chromium_src-b1c2a554239ab3be950f0d19581945eb115e7a6c.tar.gz chromium_src-b1c2a554239ab3be950f0d19581945eb115e7a6c.tar.bz2 | |
Decouples certificates viewers from NSS to prepare support for OpenSSL.
This change is a pre-requisite for http://codereview.chromium.org/3529008/show
There are no functional changes, it's only refactoring existing code.
BUG=None
TEST=Go to an https:// page and check the certificate info.
Review URL: http://codereview.chromium.org/3565006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/net/net.gyp b/net/net.gyp index 9fccc53..c4cef18 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -666,7 +666,13 @@ ['use_openssl==1 and OS == "linux"', { 'dependencies': [ '../build/linux/system.gyp:openssl', - ] + ], + 'sources!': [ + '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!': [ @@ -917,7 +923,7 @@ ], } ], - ['OS == "linux"', { + [ 'OS == "linux"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -926,6 +932,14 @@ }], ], }], + [ 'use_openssl == 1 and OS == "linux"', { + # When building for OpenSSL, we need to exclude some NSS files. + # TODO(bulach): remove once we fully support OpenSSL. + 'sources!': [ + 'base/cert_database_nss_unittest.cc', + ], + }, + ], [ 'OS == "win"', { 'sources!': [ 'http/http_auth_gssapi_posix_unittest.cc', @@ -1065,6 +1079,11 @@ }], ], }], + ['use_openssl==1 and OS == "linux"', { + 'dependencies': [ + '../build/linux/system.gyp:openssl', + ] + }], ], }, { |