net/net.gyp - Issue 5625012: Switch linux OpenSSL build to use custom openssl version

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: net/net.gyp

Issue 5625012: Switch linux OpenSSL build to use custom openssl version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove the system openssl build rule altogether, depend on third party directly Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp

index 82359ab4ed4aad8deab27de538a8b2ab266d444f..c536ecd04e05c15992b4bdf4ed254fbf3e227a1e 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -237,7 +237,7 @@

'conditions': [

['use_openssl==1', {

'dependencies': [

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

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

}, { # else: not using openssl. Use NSS.

'dependencies': [

@@ -754,7 +754,7 @@

'conditions': [

['use_openssl==1', {

'dependencies': [

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

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

{ # else use_openssl==0, use NSS

@@ -1196,7 +1196,7 @@

'conditions': [

['use_openssl==1', {

'dependencies': [

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

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

]

}, {

'dependencies': [

« no previous file with comments | « chrome/chrome_common.gypi ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »