chrome/chrome_common.gypi - Issue 6962044: Revert 87315 - Revert 87309 - Second attempt to fix linux redux builder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_common.gypi

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

Index: chrome/chrome_common.gypi

===================================================================

--- chrome/chrome_common.gypi (revision 87315)

+++ chrome/chrome_common.gypi (working copy)

@@ -377,18 +377,8 @@

'conditions': [

['os_posix == 1 and OS != "mac"', {

- 'conditions': [

- ['use_openssl==1', {

- 'dependencies': [

- '../third_party/openssl/openssl.gyp:openssl',

- ],

- },

- { # else !use_openssl

- 'dependencies': [

- '../build/linux/system.gyp:nss',

- ],

- },

- ],

+ 'dependencies': [

+ '../build/linux/system.gyp:ssl',

{ # 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 »