diff options
| author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 03:12:08 +0000 |
|---|---|---|
| committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 03:12:08 +0000 |
| commit | 2028539fd25578e5725e528d8a2de8f53923576d (patch) | |
| tree | eb1ec876d2fcb69682da38588eb7d7468c9b937b /net/net.gyp | |
| parent | 772745f0895e84b6ba2dbc32ea26993e67d64b7e (diff) | |
| download | chromium_src-2028539fd25578e5725e528d8a2de8f53923576d.zip chromium_src-2028539fd25578e5725e528d8a2de8f53923576d.tar.gz chromium_src-2028539fd25578e5725e528d8a2de8f53923576d.tar.bz2 | |
Revert 49489 - Use NSS for SSL by default on Mac OS X.
To use Mac OS X Secure Transport in Chromium, specify the --use-system-ssl
command-line switch, which also replaced the --use-schannel command-line
switch for Windows. All other programs are hardcoded to use NSS for SSL.
If SSL client authentication is requested, fall back on Mac OS X Secure
Transport for now.
R=mark,mbelshe
BUG=30689
TEST=none
Review URL: http://codereview.chromium.org/2747002
TBR=wtc@chromium.org
Review URL: http://codereview.chromium.org/2775005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/net/net.gyp b/net/net.gyp index 3dc5b4a..eb6686a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -446,12 +446,10 @@ 'socket/ssl_client_socket.h', 'socket/ssl_client_socket_mac.cc', 'socket/ssl_client_socket_mac.h', - 'socket/ssl_client_socket_mac_factory.cc', - 'socket/ssl_client_socket_mac_factory.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', + 'socket/ssl_client_socket_nss.cc', + 'socket/ssl_client_socket_nss.h', 'socket/ssl_client_socket_win.cc', 'socket/ssl_client_socket_win.h', 'socket/tcp_client_socket.h', @@ -554,6 +552,10 @@ ], }], [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + 'sources!': [ + 'socket/ssl_client_socket_nss_factory.cc', + 'socket/ssl_client_socket_nss_factory.h', + ], 'dependencies': [ '../build/linux/system.gyp:gconf', '../build/linux/system.gyp:gdk', @@ -586,8 +588,6 @@ { # else: OS != "win" 'sources!': [ 'proxy/proxy_resolver_winhttp.cc', - 'socket/ssl_client_socket_nss_factory.cc', - 'socket/ssl_client_socket_nss_factory.h', ], }, ], @@ -603,12 +603,6 @@ ] }, }, - { # else: OS != "mac" - 'sources!': [ - 'socket/ssl_client_socket_mac_factory.cc', - 'socket/ssl_client_socket_mac_factory.h', - ], - }, ], ], }, |