diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 20:28:03 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 20:28:03 +0000 |
| commit | 3dd6f5e0807447194b12c7adc9a730d81738a0a6 (patch) | |
| tree | 6176f288326fdb65d167ce419929260209fff32b /build | |
| parent | 3f94a9eedbb0bd352beeea9ae65591c69c9012f1 (diff) | |
| download | chromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.zip chromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.tar.gz chromium_src-3dd6f5e0807447194b12c7adc9a730d81738a0a6.tar.bz2 | |
Use SSLClientSocketNSS on Mac OS X. By default, chrome still uses
SSLClientSocketMac. Specify the --use-nss-for-ssl command-line
option to use SSLClientSocketNSS.
The nss.gyp in src/net/third_party/nss is renamed ssl.gyp to avoid
a naming conflict with the nss.gyp in src/third_party/nss. The
GYP generator for Xcode project files disallows same-named .gyp files.
SSL client authentication doesn't work yet.
R=mark
BUG=30689
TEST=No build and test failures on Mac and Windows.
Review URL: http://codereview.chromium.org/2322008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 7 | ||||
| -rw-r--r-- | build/linux/system.gyp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 39513ed..175332b 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -19,6 +19,7 @@ '../ipc/ipc.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', + '../net/third_party/nss/ssl.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', @@ -58,6 +59,11 @@ '../third_party/yasm/yasm.gyp:*#host', ], }], + ['OS=="mac" or OS=="win"', { + 'dependencies': [ + '../third_party/nss/nss.gyp:*', + ], + }], ['OS=="mac"', { 'dependencies': [ '../third_party/ocmock/ocmock.gyp:*', @@ -81,7 +87,6 @@ 'dependencies': [ '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', '../tools/xdisplaycheck/xdisplaycheck.gyp:*', - '../net/third_party/nss/nss.gyp:*', ], }], ['OS=="win"', { diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 94650e9..dbd394b 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -76,7 +76,7 @@ 'conditions': [ ['use_system_ssl==0', { 'dependencies': [ - '../../net/third_party/nss/nss.gyp:ssl', + '../../net/third_party/nss/ssl.gyp:ssl', '../../third_party/zlib/zlib.gyp:zlib', ], 'direct_dependent_settings': { |