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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_common.gypi

Issue 7054041: 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_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
===================================================================
--- chrome/chrome_common.gypi (revision 87314)
+++ chrome/chrome_common.gypi (working copy)
@@ -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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698