diff options
author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 20:07:06 +0000 |
---|---|---|
committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 20:07:06 +0000 |
commit | 2fcd215fc3158d44935845ee86e98346848cab8b (patch) | |
tree | fbf1938a15bc6a027e1912ce9da7d1537f906ef5 /net/BUILD.gn | |
parent | 5657db4b4384ac2cd77c21a68afda29537811f16 (diff) | |
download | chromium_src-2fcd215fc3158d44935845ee86e98346848cab8b.zip chromium_src-2fcd215fc3158d44935845ee86e98346848cab8b.tar.gz chromium_src-2fcd215fc3158d44935845ee86e98346848cab8b.tar.bz2 |
Revert 283813 "Switch to BoringSSL."
Failed WebRtcBrowserTest on android_dbg_triggered_tests.
> Switch to BoringSSL.
>
> (This is a reland of r283542 which was reverted in r283591 because it
> broke the WebView build. The android_aosp trybots are broken[1] so this
> based on hope.)
>
> This is a much larger change than its diff suggests. If it breaks
> something, please revert first and ask questions later.
>
> [1] http://code.google.com/p/chromium/issues/detail?id=394597
>
> BUG=none
>
> Review URL: https://codereview.chromium.org/399993002
TBR=agl@chromium.org
Review URL: https://codereview.chromium.org/405503002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/BUILD.gn')
-rw-r--r-- | net/BUILD.gn | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/net/BUILD.gn b/net/BUILD.gn index a150128..5210ca8 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -523,6 +523,10 @@ component("net") { if (!is_android_webview_build) { deps += [ ":net_jni_headers" ] + + # The net/android/keystore_openssl.cc source file needs to access an + # OpenSSL-internal header. + include_dirs = [ "//third_party/openssl" ] } } @@ -913,7 +917,7 @@ if (is_linux) { ":epoll_server", ":net", "//base", - "//third_party/boringssl", + "//third_party/openssl", ] } @@ -932,7 +936,7 @@ if (is_linux) { ":test_support", "//testing/gtest", "//testing/gmock", - "//third_party/boringssl", + "//third_party/openssl", ] } @@ -983,7 +987,7 @@ if (is_linux) { "//base", "//base/third_party/dynamic_annotations", "//crypto", - "//third_party/boringssl", + "//third_party/openssl", "//url", ] } @@ -994,7 +998,7 @@ if (is_linux) { ":quic_base", ":net", "//base", - "//third_party/boringssl", + "//third_party/openssl", ] } } @@ -1323,7 +1327,7 @@ executable("quic_server") { ":quic_tools", ":net", "//base", - "//third_party/boringssl", + "//third_party/openssl", ] } |