Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
diff --git a/net/net.gyp b/net/net.gyp
index bda1845..c7c2c94 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -255,7 +255,7 @@
'third_party/mozilla_security_manager/nsPKCS12Blob.h',
],
'dependencies': [
- '../third_party/openssl/openssl.gyp:openssl',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
],
},
{ # else !use_openssl: remove the unneeded files
@@ -277,14 +277,17 @@
'quic/crypto/p256_key_exchange_openssl.cc',
'quic/crypto/scoped_evp_aead_ctx.cc',
'quic/crypto/scoped_evp_aead_ctx.h',
- 'socket/openssl_ssl_util.cc',
- 'socket/openssl_ssl_util.h',
'socket/ssl_client_socket_openssl.cc',
'socket/ssl_client_socket_openssl.h',
'socket/ssl_server_socket_openssl.cc',
'socket/ssl_server_socket_openssl.h',
'socket/ssl_session_cache_openssl.cc',
'socket/ssl_session_cache_openssl.h',
+ 'ssl/openssl_platform_key_mac.cc',
+ 'ssl/openssl_platform_key_win.cc',
+ 'ssl/openssl_platform_key.h',
+ 'ssl/openssl_ssl_util.cc',
+ 'ssl/openssl_ssl_util.h',
],
},
],
@@ -466,7 +469,7 @@
}],
[ 'OS == "android"', {
'dependencies': [
- '../third_party/openssl/openssl.gyp:openssl',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
'net_jni_headers',
],
'sources!': [
@@ -475,11 +478,6 @@
'cert/cert_verify_proc_openssl.cc',
'cert/test_root_certs_openssl.cc',
],
- # The net/android/keystore_openssl.cc source file needs to
- # access an OpenSSL-internal header.
- 'include_dirs': [
- '../third_party/openssl',
- ],
},
],
[ 'use_icu_alternatives_on_android == 1', {
@@ -542,6 +540,7 @@
'../base/base.gyp:base_prefs_test_support',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../crypto/crypto.gyp:crypto',
+ '../crypto/crypto.gyp:crypto_test_support',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/zlib/zlib.gyp:zlib',
@@ -594,7 +593,7 @@
[ 'use_openssl == 1', {
# Avoid compiling/linking with the system library.
'dependencies': [
- '../third_party/openssl/openssl.gyp:openssl',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
],
}, { # use_openssl == 0
'conditions': [
@@ -789,7 +788,9 @@
# The following tests are disabled because they don't apply to
# iOS.
# OS is not "linux" or "freebsd" or "openbsd".
- 'socket/unix_domain_socket_posix_unittest.cc',
+ 'socket/unix_domain_client_socket_posix_unittest.cc',
+ 'socket/unix_domain_listen_socket_posix_unittest.cc',
+ 'socket/unix_domain_server_socket_posix_unittest.cc',
# See bug http://crbug.com/344533.
'disk_cache/blockfile/index_table_v3_unittest.cc',
@@ -797,7 +798,7 @@
}],
[ 'OS == "android"', {
'dependencies': [
- '../third_party/openssl/openssl.gyp:openssl',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
],
'sources!': [
'dns/dns_config_service_posix_unittest.cc',
@@ -979,7 +980,7 @@
'conditions': [
['use_openssl==1', {
'dependencies': [
- '../third_party/openssl/openssl.gyp:openssl',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
],
}, {
'dependencies': [
@@ -1382,7 +1383,7 @@
],
'dependencies': [
'../base/base.gyp:base',
- '../third_party/openssl/openssl.gyp:openssl',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
'balsa',
'epoll_server',
'net',
@@ -1427,7 +1428,7 @@
'dependencies': [
'../testing/gtest.gyp:gtest',
'../testing/gmock.gyp:gmock',
- '../third_party/openssl/openssl.gyp:openssl',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
'flip_in_mem_edsm_server_base',
'net',
'net_test_support',