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 /net | |
| 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 'net')
| -rw-r--r-- | net/net.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
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', ], }], ], |