Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: crypto/crypto.gyp

Issue 6962044: Revert 87315 - Revert 87309 - Second attempt to fix linux redux builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/crypto.gyp
===================================================================
--- crypto/crypto.gyp (revision 87315)
+++ crypto/crypto.gyp (working copy)
@@ -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!': [
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698