diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 18:20:37 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-22 18:20:37 +0000 |
| commit | edfd0f43f597524764f6cb6988f6d52cc3d5a815 (patch) | |
| tree | 8d04cf46384f60e33b16e45a91865fcae291fee3 /net/net.gyp | |
| parent | 6a565f0f33da0eb60371a5be8980b521f6b1980a (diff) | |
| download | chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.zip chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.tar.gz chromium_src-edfd0f43f597524764f6cb6988f6d52cc3d5a815.tar.bz2 | |
Switch to BoringSSL.
This is a reland of r284079 which was reverted in r284248 for components build
issues. That, in turn, was a reland of r283813 which was reverted in r283845
because it broke WebRTC tests on Android. That, in turn, was a reland of
r283542 which was reverted in r283591 because it broke the WebView build.
This is a much larger change than its diff suggests. If it breaks
something, please revert first and ask questions later.
BUG=393317
R=agl@chromium.org, jam@chromium.org
Review URL: https://codereview.chromium.org/401153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/net/net.gyp b/net/net.gyp index bda1845..3b38400 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 @@ -466,7 +466,7 @@ }], [ 'OS == "android"', { 'dependencies': [ - '../third_party/openssl/openssl.gyp:openssl', + '../third_party/boringssl/boringssl.gyp:boringssl', 'net_jni_headers', ], 'sources!': [ @@ -475,11 +475,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', { @@ -594,7 +589,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': [ @@ -797,7 +792,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 +974,7 @@ 'conditions': [ ['use_openssl==1', { 'dependencies': [ - '../third_party/openssl/openssl.gyp:openssl', + '../third_party/boringssl/boringssl.gyp:boringssl', ], }, { 'dependencies': [ @@ -1382,7 +1377,7 @@ ], 'dependencies': [ '../base/base.gyp:base', - '../third_party/openssl/openssl.gyp:openssl', + '../third_party/boringssl/boringssl.gyp:boringssl', 'balsa', 'epoll_server', 'net', @@ -1427,7 +1422,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', |