Revert 283813 "Switch to BoringSSL."

trunk/src/net/net.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 237 matching lines @@
               'socket/ssl_server_socket_nss.cc',
               'socket/ssl_server_socket_nss.h',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
             'dependencies': [
-              '../third_party/boringssl/boringssl.gyp:boringssl',
+              '../third_party/openssl/openssl.gyp:openssl',
             ],
           },
           {  # else !use_openssl: remove the unneeded files
             'sources!': [
               'base/crypto_module_openssl.cc',
               'cert/ct_log_verifier_openssl.cc',
               'cert/ct_objects_extractor_openssl.cc',
               'cert/jwk_serializer_openssl.cc',
               'cert/x509_util_openssl.cc',
               'cert/x509_util_openssl.h',
@@ skipping 190 matching lines @@
             },
           },
         ],
         ['OS=="android" and _toolset=="target" and android_webview_build == 0', {
           'dependencies': [
              'net_java',
           ],
         }],
         [ 'OS == "android"', {
             'dependencies': [
-              '../third_party/boringssl/boringssl.gyp:boringssl',
+              '../third_party/openssl/openssl.gyp:openssl',
               'net_jni_headers',
             ],
             'sources!': [
               'base/openssl_private_key_store_memory.cc',
               'cert/cert_database_openssl.cc',
               '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', {
             'dependencies!': [
               '../base/base.gyp:base_i18n',
               '../third_party/icu/icu.gyp:icui18n',
               '../third_party/icu/icu.gyp:icuuc',
             ],
             'sources!': [
               'base/filename_util_icu.cc',
@@ skipping 94 matching lines @@
         }],
         [ 'use_nss != 1', {
           'sources!': [
             'ssl/client_cert_store_nss_unittest.cc',
             'ssl/client_cert_store_chromeos_unittest.cc',
           ],
         }],
         [ 'use_openssl == 1', {
           # Avoid compiling/linking with the system library.
           'dependencies': [
-            '../third_party/boringssl/boringssl.gyp:boringssl',
+            '../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',
@@ skipping 182 matching lines @@
               # iOS.
               # OS is not "linux" or "freebsd" or "openbsd".
               'socket/unix_domain_socket_posix_unittest.cc',
 
               # See bug http://crbug.com/344533.
               'disk_cache/blockfile/index_table_v3_unittest.cc',
             ],
         }],
         [ 'OS == "android"', {
             'dependencies': [
-              '../third_party/boringssl/boringssl.gyp:boringssl',
+              '../third_party/openssl/openssl.gyp:openssl',
             ],
             'sources!': [
               'dns/dns_config_service_posix_unittest.cc',
             ],
           },
         ],
         ['OS == "android"', {
           # TODO(mmenke):  This depends on test_support_base, which depends on
           #                icu.  Figure out a way to remove that dependency.
           'dependencies': [
@@ skipping 160 matching lines @@
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
-                '../third_party/boringssl/boringssl.gyp:boringssl',
+                '../third_party/openssl/openssl.gyp:openssl',
               ],
             }, {
               'dependencies': [
                 '../build/linux/system.gyp:ssl',
               ],
             }],
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
@@ skipping 377 matching lines @@
           ],
         },
         {
           'target_name': 'flip_in_mem_edsm_server_base',
           'type': 'static_library',
           'cflags': [
             '-Wno-deprecated',
           ],
           'dependencies': [
             '../base/base.gyp:base',
-            '../third_party/boringssl/boringssl.gyp:boringssl',
+            '../third_party/openssl/openssl.gyp:openssl',
             'balsa',
             'epoll_server',
             'net',
           ],
           'sources': [
             'tools/dump_cache/url_to_filename_encoder.cc',
             'tools/dump_cache/url_to_filename_encoder.h',
             'tools/dump_cache/url_utilities.h',
             'tools/dump_cache/url_utilities.cc',
             'tools/flip_server/acceptor_thread.h',
@@ skipping 24 matching lines @@
             'tools/flip_server/streamer_interface.cc',
             'tools/flip_server/streamer_interface.h',
           ],
         },
         {
           'target_name': 'flip_in_mem_edsm_server_unittests',
           'type': 'executable',
           'dependencies': [
               '../testing/gtest.gyp:gtest',
               '../testing/gmock.gyp:gmock',
-              '../third_party/boringssl/boringssl.gyp:boringssl',
+              '../third_party/openssl/openssl.gyp:openssl',
               'flip_in_mem_edsm_server_base',
               'net',
               'net_test_support',
           ],
           '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',
@@ skipping 268 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }