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

Unified Diff: build/linux/system.gyp

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 | « base/base.gyp ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
===================================================================
--- build/linux/system.gyp (revision 87314)
+++ build/linux/system.gyp (working copy)
@@ -74,18 +74,13 @@
}]]
},
{
- 'target_name': 'ssl',
+ 'target_name': 'nss',
'type': 'settings',
'conditions': [
['_toolset=="target"', {
'conditions': [
- ['use_openssl==1', {
+ ['use_system_ssl==0', {
'dependencies': [
- '../../third_party/openssl/openssl.gyp:openssl',
- ],
- }],
- ['use_openssl==0 and use_system_ssl==0', {
- 'dependencies': [
'../../net/third_party/nss/ssl.gyp:ssl',
'../../third_party/zlib/zlib.gyp:zlib',
],
@@ -111,8 +106,7 @@
'<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
],
},
- }],
- ['use_openssl==0 and use_system_ssl==1', {
+ }, {
'direct_dependent_settings': {
'cflags': [
'<!@(<(pkg-config) --cflags nss)',
@@ -129,8 +123,8 @@
'<!@(<(pkg-config) --libs-only-l nss)',
],
},
- }],
- ]
+ }
+ ]]
}],
],
},
« no previous file with comments | « base/base.gyp ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698