diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:02:45 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:02:45 +0000 |
| commit | 8d84dcb83f501e51ff28b28d2a871ad80deb1ccc (patch) | |
| tree | 48fb0b19da2f48e0c1a6be1f05d81becc22a7c72 /net/net.gyp | |
| parent | 1e029feda144670dd1b604ab8159e20486e93504 (diff) | |
| download | chromium_src-8d84dcb83f501e51ff28b28d2a871ad80deb1ccc.zip chromium_src-8d84dcb83f501e51ff28b28d2a871ad80deb1ccc.tar.gz chromium_src-8d84dcb83f501e51ff28b28d2a871ad80deb1ccc.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -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 4c9603e..e757129 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -741,7 +741,7 @@ }, { # else use_openssl==0, use NSS 'dependencies': [ - '../build/linux/system.gyp:ssl', + '../build/linux/system.gyp:nss', ], }], ], @@ -999,7 +999,7 @@ [ 'toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:ssl', + '../build/linux/system.gyp:nss', ], }, { # else: OS is not in the above list @@ -1175,7 +1175,7 @@ ], }, { 'dependencies': [ - '../build/linux/system.gyp:ssl', + '../build/linux/system.gyp:nss', ], }], ], |