Revert 283813 "Switch to BoringSSL."

trunk/src/net/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//url/config.gni")
 
 # TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni.
@@ skipping 505 matching lines @@
     set_sources_assignment_filter([])
     sources += [
       "base/platform_mime_util_linux.cc",
       "base/address_tracker_linux.cc",
       "base/address_tracker_linux.h",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
     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" ]
     }
   }
 
   if (use_icu_alternatives_on_android) {
     deps -= [
       "//base:i18n",
       "//third_party/icu",
     ]
     sources -= [
       "base/filename_util_icu.cc",
@@ skipping 370 matching lines @@
       "tools/flip_server/spdy_util.cc",
       "tools/flip_server/spdy_util.h",
       "tools/flip_server/streamer_interface.cc",
       "tools/flip_server/streamer_interface.h",
     ]
     deps = [
       ":balsa",
       ":epoll_server",
       ":net",
       "//base",
-      "//third_party/boringssl",
+      "//third_party/openssl",
     ]
   }
 
   executable("flip_in_mem_edsm_server_unittests") {
     sources = [
       "tools/flip_server/flip_test_utils.cc",
       "tools/flip_server/flip_test_utils.h",
       "tools/flip_server/http_interface_test.cc",
       "tools/flip_server/mem_cache_test.cc",
       "tools/flip_server/run_all_tests.cc",
       "tools/flip_server/spdy_interface_test.cc",
     ]
     deps = [
       ":flip_in_mem_edsm_server_base",
       ":net",
       ":test_support",
       "//testing/gtest",
       "//testing/gmock",
-      "//third_party/boringssl",
+      "//third_party/openssl",
     ]
   }
 
   executable("flip_in_mem_edsm_server") {
     sources = [ "tools/flip_server/flip_in_mem_edsm_server.cc" ]
     deps = [
       ":flip_in_mem_edsm_server_base",
       ":net",
       "//base",
     ]
@@ skipping 30 matching lines @@
       "tools/quic/quic_time_wait_list_manager.h",
       "tools/quic/quic_time_wait_list_manager.cc",
     ]
     deps = [
       ":balsa",
       ":epoll_server",
       ":net",
       "//base",
       "//base/third_party/dynamic_annotations",
       "//crypto",
-      "//third_party/boringssl",
+      "//third_party/openssl",
       "//url",
     ]
   }
 
   executable("quic_client") {
     sources = [ "tools/quic/quic_client_bin.cc" ]
     deps = [
       ":quic_base",
       ":net",
       "//base",
-      "//third_party/boringssl",
+      "//third_party/openssl",
     ]
   }
 }
 
 if (is_android) {
   generate_jni("net_jni_headers") {
     sources = [
       "android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
       "android/java/src/org/chromium/net/AndroidKeyStore.java",
       "android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
@@ skipping 308 matching lines @@
     deps -= [ "//base:i18n" ]
   }
 }
 
 executable("quic_server") {
   sources = [ "quic/quic_server_bin.cc" ]
   deps = [
     ":quic_tools",
     ":net",
     "//base",
-    "//third_party/boringssl",
+    "//third_party/openssl",
   ]
 }
 
 }  # !is_android