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 /build | |
| 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 'build')
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | build/linux/system.gyp | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/build/common.gypi b/build/common.gypi index 718c2e5..fb1a70d 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -320,7 +320,7 @@ # Use GConf, the GNOME configuration system. 'use_gconf%': 1, - # Use OpenSSL instead of NSS. Currently in development. + # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803 'use_openssl%': 0, 'conditions': [ diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 905f14e..39b3a11 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -346,29 +346,6 @@ ], }, }, - { - 'target_name': 'openssl', - 'type': 'settings', - 'conditions': [ - ['use_openssl==1', { - 'direct_dependent_settings': { - 'defines': [ - # OpenSSL support is incomplete: http://crbug.com/62803. - # Defining USE_OPENSSL disables USE_NSS. - 'USE_OPENSSL', - ], - 'include_dirs': [ - '<!@(<(pkg-config) --cflags openssl)', - ], - }, - 'link_settings': { - 'libraries': [ - '<!@(<(pkg-config) --libs-only-l openssl)', - ], - }, - },], - ], - }, ], } |