diff options
| -rw-r--r-- | base/base.gyp | 2 | ||||
| -rw-r--r-- | build/linux/system.gyp | 16 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 14 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 14 | ||||
| -rw-r--r-- | crypto/crypto.gyp | 21 | ||||
| -rw-r--r-- | net/net.gyp | 6 |
7 files changed, 32 insertions, 43 deletions
diff --git a/base/base.gyp b/base/base.gyp index db1cd99..c1bdcb3 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -262,7 +262,7 @@ ], 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }, { # toolkit_uses_gtk!=1 diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 587f31d..92240d3 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -74,12 +74,17 @@ }]] }, { - 'target_name': 'nss', + 'target_name': 'ssl', 'type': 'settings', 'conditions': [ ['_toolset=="target"', { 'conditions': [ - ['use_system_ssl==0', { + ['use_openssl==1', { + 'dependencies': [ + '../../third_party/openssl/openssl.gyp:openssl', + ], + }], + ['use_openssl==0 and use_system_ssl==0', { 'dependencies': [ '../../net/third_party/nss/ssl.gyp:ssl', '../../third_party/zlib/zlib.gyp:zlib', @@ -106,7 +111,8 @@ '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', ], }, - }, { + }], + ['use_openssl==0 and use_system_ssl==1', { 'direct_dependent_settings': { 'cflags': [ '<!@(<(pkg-config) --cflags nss)', @@ -123,8 +129,8 @@ '<!@(<(pkg-config) --libs-only-l nss)', ], }, - } - ]] + }], + ] }], ], }, diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 9211d76..abbc724 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3667,7 +3667,7 @@ '../build/linux/system.gyp:gconf', '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:gtkprint', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', '../build/linux/system.gyp:x11', '../third_party/undoview/undoview.gyp:undoview', ], diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 3a0953a..2b0b24a 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -377,18 +377,8 @@ ], 'conditions': [ ['os_posix == 1 and OS != "mac"', { - 'conditions': [ - ['use_openssl==1', { - 'dependencies': [ - '../third_party/openssl/openssl.gyp:openssl', - ], - }, - { # else !use_openssl - 'dependencies': [ - '../build/linux/system.gyp:nss', - ], - }, - ], + 'dependencies': [ + '../build/linux/system.gyp:ssl', ], }, { # else: OS is not in the above list diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 497e83c..73fd01b 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -215,7 +215,7 @@ ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', ], }], ['OS=="win"', { @@ -476,7 +476,7 @@ ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], @@ -2027,7 +2027,7 @@ ], 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources!': [ @@ -2571,7 +2571,7 @@ ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources': [ @@ -3212,7 +3212,7 @@ ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', 'packed_resources' ], }], @@ -3336,7 +3336,7 @@ ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', ], }], ['OS=="mac"', { @@ -3484,7 +3484,7 @@ ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', ], }], ['toolkit_views==1', { diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index e662e52..02ef8e1 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -19,24 +19,17 @@ ], 'conditions': [ [ 'os_posix == 1 and OS != "mac"', { + 'dependencies': [ + '../build/linux/system.gyp:ssl', + ], + 'export_dependent_settings': [ + '../build/linux/system.gyp:ssl', + ], 'conditions': [ [ 'chromeos==1', { 'sources/': [ ['include', '_chromeos\\.cc$'] ] }, ], - [ 'use_openssl==1', { - 'dependencies': [ - '../third_party/openssl/openssl.gyp:openssl', - ], - }, { # use_openssl==0 - 'dependencies': [ - '../build/linux/system.gyp:nss', - ], - 'export_dependent_settings': [ - '../build/linux/system.gyp:nss', - ], - } - ], ], }, { # os_posix != 1 or OS == "mac" 'sources/': [ @@ -202,7 +195,7 @@ ], ], 'dependencies': [ - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', ], }, { # os_posix != 1 or OS == "mac" 'sources!': [ diff --git a/net/net.gyp b/net/net.gyp index e757129..4c9603e 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -741,7 +741,7 @@ }, { # else use_openssl==0, use NSS 'dependencies': [ - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', ], }], ], @@ -999,7 +999,7 @@ [ 'toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', ], }, { # else: OS is not in the above list @@ -1175,7 +1175,7 @@ ], }, { 'dependencies': [ - '../build/linux/system.gyp:nss', + '../build/linux/system.gyp:ssl', ], }], ], |