diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 18:36:24 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 18:36:24 +0000 |
| commit | 32e1dee439ca0946f80508eeeedaebfbc2cc907c (patch) | |
| tree | 3e68eab1434a4b69ce1f7914097665d15f6e8e19 /net/net.gyp | |
| parent | f9bd583cdd7c42c98ef5c6afb25366c1cdfec2bf (diff) | |
| download | chromium_src-32e1dee439ca0946f80508eeeedaebfbc2cc907c.zip chromium_src-32e1dee439ca0946f80508eeeedaebfbc2cc907c.tar.gz chromium_src-32e1dee439ca0946f80508eeeedaebfbc2cc907c.tar.bz2 | |
Switch linux OpenSSL build to use custom openssl version
This allows us to test experimental library features, and to track a known openssl version.
Also bumps OpenSSL 65717:68738, to fix up the default CA root path in the reference library.
BUG=None
TEST=Still builds & runs!
Review URL: http://codereview.chromium.org/5625012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/net.gyp b/net/net.gyp index 065a39d..cb589ea 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': [ @@ -755,7 +755,7 @@ 'conditions': [ ['use_openssl==1', { 'dependencies': [ - '../build/linux/system.gyp:openssl', + '../third_party/openssl/openssl.gyp:openssl', ], }, { # else use_openssl==0, use NSS @@ -1198,7 +1198,7 @@ 'conditions': [ ['use_openssl==1', { 'dependencies': [ - '../build/linux/system.gyp:openssl', + '../third_party/openssl/openssl.gyp:openssl', ] }, { 'dependencies': [ |