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
[email protected]
Review URL: http://codereview.chromium.org/7054041
[email protected]
Review URL: http://codereview.chromium.org/6962044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87316 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index e662e52..02ef8e1b 100644
--- a/crypto/crypto.gyp
+++ b/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!': [
