Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: net/net.gyp

Issue 3495005: Prototype OpenSSL client socket implementation. (Closed)
Patch Set: agl comments no. 2 Created 10 years, 3 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: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 06105fa0a6a61e4c5f2f713e81529b90ed4cefc8..17926735e06c735e8593ac7cd49d7dd3525e3319 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -5,6 +5,7 @@
{
'variables': {
'chromium_code': 1,
+ 'use_openssl%': 0,
},
'targets': [
{
@@ -539,6 +540,8 @@
'socket/ssl_client_socket_nss.h',
'socket/ssl_client_socket_nss_factory.cc',
'socket/ssl_client_socket_nss_factory.h',
+ 'socket/ssl_client_socket_openssl.cc',
+ 'socket/ssl_client_socket_openss.h',
'socket/ssl_client_socket_pool.cc',
'socket/ssl_client_socket_pool.h',
'socket/ssl_client_socket_win.cc',
@@ -650,6 +653,19 @@
'proxy/proxy_config_service_linux.h',
],
}],
+ ['use_openssl==1 and OS == "linux"', {
+ # OpenSSL support is in development.
+ 'dependencies': [
+ '../build/linux/system.gyp:openssl',
+ ]
+ },
+ { # else !use_openssl: remove the unneeded files
+ 'sources!': [
+ 'socket/ssl_client_socket_openssl.cc',
+ 'socket/ssl_client_socket_openss.h',
+ ],
+ },
+ ],
[ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
'dependencies': [
'../build/linux/system.gyp:gconf',

Powered by Google App Engine
This is Rietveld 408576698