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 /chrome/chrome_common.gypi | |
| 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 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 2b0b24a..3a0953a 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -377,8 +377,18 @@ ], 'conditions': [ ['os_posix == 1 and OS != "mac"', { - 'dependencies': [ - '../build/linux/system.gyp:ssl', + 'conditions': [ + ['use_openssl==1', { + 'dependencies': [ + '../third_party/openssl/openssl.gyp:openssl', + ], + }, + { # else !use_openssl + 'dependencies': [ + '../build/linux/system.gyp:nss', + ], + }, + ], ], }, { # else: OS is not in the above list |