diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:19:30 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:19:30 +0000 |
| commit | 638e9df4a736f795d2dacb99ed301b94f066a5c2 (patch) | |
| tree | 481edbb91a024d05a94c90d4024e0a430b13ac4f /chrome/chrome_tests.gypi | |
| parent | 8d84dcb83f501e51ff28b28d2a871ad80deb1ccc (diff) | |
| download | chromium_src-638e9df4a736f795d2dacb99ed301b94f066a5c2.zip chromium_src-638e9df4a736f795d2dacb99ed301b94f066a5c2.tar.gz chromium_src-638e9df4a736f795d2dacb99ed301b94f066a5c2.tar.bz2 | |
Revert 87315 - Revert 87309 - Second attempt to fix linux redux builder
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
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
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', { |