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: http://src.chromium.org/svn/trunk/src/build@68749 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
joth@chromium.org 2010-12-09 18:36:24 +00:00
Родитель 0ad77ef29d
Коммит ad3cba4a39
2 изменённых файлов: 1 добавлений и 24 удалений

Просмотреть файл

@ -320,7 +320,7 @@
# Use GConf, the GNOME configuration system. # Use GConf, the GNOME configuration system.
'use_gconf%': 1, '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, 'use_openssl%': 0,
'conditions': [ 'conditions': [

Просмотреть файл

@ -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)',
],
},
},],
],
},
], ],
} }