chromium/src
0
Fork 0
Code Activity

Revert 87315 - Revert 87309 - Second attempt to fix linux redux builder

Browse Source 
Numerous targets were depending on linux/system.gyp:nss even on the openssl build and the gyp update means it shows up as a link error.

BUG=None
TEST=Builds with and without use_openssl=1

Review URL: http://codereview.chromium.org/7050040

TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/7054041

TBR=mirandac@chromium.org
Review URL: http://codereview.chromium.org/6962044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87316 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
mirandac@chromium.org
2011-05-31 17:19:30 +00:00
parent 8d84dcb83f
commit 638e9df4a7
7 changed files with 32 additions and 43 deletions

2
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

16
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)',
],
},
}
]]
}],
]
}],
],
},

2
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',
],

14
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

14
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', {

21
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!': [

6
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',
],
}],
],