diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 02:09:36 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 02:09:36 +0000 |
| commit | abe48d303fe241d38e30df64cc6c4ea197be61d9 (patch) | |
| tree | bd865297c541bf8408c9eeaa1361b823f24bd3bf /net/net.gyp | |
| parent | 591703a67c02301d57201c7e6962b7eea1360541 (diff) | |
| download | chromium_src-abe48d303fe241d38e30df64cc6c4ea197be61d9.zip chromium_src-abe48d303fe241d38e30df64cc6c4ea197be61d9.tar.gz chromium_src-abe48d303fe241d38e30df64cc6c4ea197be61d9.tar.bz2 | |
Use NSS instead of the system SSL library for SSL if
the --use-nss-for-ssl or --use-flip command-line switch
is specified.
R=mark,mbelshe
BUG=28744
TEST=Run chrome.exe with and without --use-nss-for-ssl.
SSL should work in both cases.
Review URL: http://codereview.chromium.org/555186
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rwxr-xr-x | net/net.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index d020e57..37e89a8 100755 --- a/net/net.gyp +++ b/net/net.gyp @@ -434,6 +434,7 @@ 'socket/ssl_client_socket.h', 'socket/ssl_client_socket_mac.cc', 'socket/ssl_client_socket_mac.h', + 'socket/ssl_client_socket_nss_factory.cc', 'socket/ssl_client_socket_nss.cc', 'socket/ssl_client_socket_nss.h', 'socket/ssl_client_socket_win.cc', @@ -528,6 +529,7 @@ { # else: OS != "win" 'sources!': [ 'proxy/proxy_resolver_winhttp.cc', + 'socket/ssl_client_socket_nss_factory.cc', ], }, ], |