Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index ab256e2d4128d348cf73e791abd295e4206985a2..d32f651d8c2768ac952f08cb29a0131ce7e5dad2 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -947,6 +947,8 @@ |
'socket/ssl_server_socket_nss.cc', |
'socket/ssl_server_socket_nss.h', |
'socket/ssl_server_socket_openssl.cc', |
+ 'socket/ssl_session_cache_openssl.cc', |
+ 'socket/ssl_session_cache_openssl.h', |
'socket/ssl_socket.h', |
'socket/stream_listen_socket.cc', |
'socket/stream_listen_socket.h', |
@@ -1332,6 +1334,8 @@ |
'socket/ssl_client_socket_openssl.cc', |
'socket/ssl_client_socket_openssl.h', |
'socket/ssl_server_socket_openssl.cc', |
+ 'socket/ssl_session_cache_openssl.cc', |
+ 'socket/ssl_session_cache_openssl.h', |
'ssl/openssl_client_key_store.cc', |
'ssl/openssl_client_key_store.h', |
], |
@@ -1872,6 +1876,7 @@ |
'socket/ssl_client_socket_pool_unittest.cc', |
'socket/ssl_client_socket_unittest.cc', |
'socket/ssl_server_socket_unittest.cc', |
+ 'socket/ssl_session_cache_openssl_unittest.cc', |
'socket/tcp_client_socket_unittest.cc', |
'socket/tcp_listen_socket_unittest.cc', |
'socket/tcp_listen_socket_unittest.h', |
@@ -2029,16 +2034,24 @@ |
'net_test_jni_headers', |
], |
}], |
- [ 'desktop_linux == 1 or chromeos == 1', { |
- 'dependencies': [ |
- '../build/linux/system.gyp:ssl', |
- ], |
- }, { # desktop_linux == 0 and chromeos == 0 |
- 'sources!': [ |
- 'cert/nss_cert_database_unittest.cc', |
- ], |
- }, |
- ], |
+ [ 'use_openssl == 1', { |
+ # Avoid compiling/linking with the system library. |
+ 'dependencies': [ |
+ '../third_party/openssl/openssl.gyp:openssl', |
+ ], |
+ }, { # use_openssl == 0 |
+ 'conditions': [ |
+ [ 'desktop_linux == 1 or chromeos == 1', { |
+ 'dependencies': [ |
+ '../build/linux/system.gyp:ssl', |
+ ], |
+ }, { # desktop_linux == 0 and chromeos == 0 |
+ 'sources!': [ |
+ 'cert/nss_cert_database_unittest.cc', |
+ ], |
+ }], |
+ ], |
+ }], |
[ 'toolkit_uses_gtk == 1', { |
'dependencies': [ |
'../build/linux/system.gyp:gtk', |
@@ -2091,6 +2104,7 @@ |
'cert/x509_util_openssl_unittest.cc', |
'quic/test_tools/crypto_test_utils_openssl.cc', |
'socket/ssl_client_socket_openssl_unittest.cc', |
+ 'socket/ssl_session_cache_openssl_unittest.cc', |
'ssl/openssl_client_key_store_unittest.cc', |
], |
}, |