5 files changed, 3 insertions, 118 deletions
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
deleted file mode 100644
index 52a3ff3..0000000
--- a/third_party/boringssl/BUILD.gn
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2014 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.
-
-# Config for us and everybody else depending on BoringSSL.
-config("openssl_config") {
-  include_dirs = []
-  include_dirs += [ "src/include" ]
-}
-
-# Config internal to this build file.
-config("openssl_internal_config") {
-  visibility = ":*"  # Only targets in this file can depend on this.
-}
-
-# The list of BoringSSL files is kept in boringssl.gypi.
-gypi_values = exec_script(
-    "//build/gypi_to_gn.py",
-    [ rebase_path("//third_party/boringssl/boringssl.gypi") ],
-    "scope",
-    [ "//third_party/boringssl/boringssl.gypi" ])
-
-component("boringssl") {
-  sources = gypi_values.boringssl_lib_sources
-
-  direct_dependent_configs = [ ":openssl_config" ]
-
-  cflags = []
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
-
-  # Also gets the include dirs from :openssl_config
-  include_dirs = [
-    "src/include",
-    # This is for arm_arch.h, which is needed by some asm files. Since the
-    # asm files are generated and kept in a different directory, they
-    # cannot use relative paths to find this file.
-    "src/crypto",
-  ]
-
-  if (cpu_arch == "x64") {
-    if (is_mac) {
-      sources += gypi_values.boringssl_mac_x86_64_sources
-    } else if (is_linux || is_android) {
-      sources += gypi_values.boringssl_linux_x86_64_sources
-    } else if (is_win) {
-      sources += gypi_values.boringssl_win_x86_64_sources
-    } else {
-      defines += [ "OPENSSL_NO_ASM" ]
-    }
-  } else if (cpu_arch == "x86") {
-    if (is_mac) {
-      sources += gypi_values.boringssl_mac_x86_sources
-    } else if (is_linux || is_android) {
-      sources += gypi_values.boringssl_linux_x86_sources
-    } else {
-      defines += [ "OPENSSL_NO_ASM" ]
-    }
-  } else if (cpu_arch == "arm") {
-    sources += gypi_values.boringssl_linux_arm_sources
-  } else {
-    defines += [ "OPENSSL_NO_ASM" ]
-  }
-}
diff --git a/third_party/boringssl/boringssl_nacl.gyp b/third_party/boringssl/boringssl_nacl.gyp
deleted file mode 100644
index 6ab4b9d..0000000
--- a/third_party/boringssl/boringssl_nacl.gyp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2014 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.
-{
-  'includes': [
-    '../../native_client/build/untrusted.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'boringssl_nacl',
-      'type': 'none',
-      'variables': {
-        'nlib_target': 'libboringssl_nacl.a',
-        'build_glibc': 0,
-        'build_newlib': 0,
-        'build_pnacl_newlib': 1,
-      },
-      'dependencies': [
-        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
-        '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
-      ],
-      'includes': [
-        # Include the auto-generated gypi file.
-        'boringssl.gypi'
-      ],
-      'sources': [
-        '<@(boringssl_lib_sources)',
-      ],
-      'defines': [
-        'OPENSSL_NO_ASM',
-      ],
-      'include_dirs': [
-        'src/include',
-        # This is for arm_arch.h, which is needed by some asm files. Since the
-        # asm files are generated and kept in a different directory, they
-        # cannot use relative paths to find this file.
-        'src/crypto',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          'src/include',
-        ],
-      },
-      'pnacl_compile_flags': [
-        '-Wno-sometimes-uninitialized',
-        '-Wno-unused-variable',
-      ],
-    },  # target boringssl_nacl
-  ],
-}
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 4ec4641..1538305 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -158,7 +158,7 @@
           'HAVE_OPENSSL_SSL_H',
         ],
         'dependencies': [
-          '../../third_party/boringssl/boringssl.gyp:boringssl',
+          '../../third_party/openssl/openssl.gyp:openssl',
         ],
       }, {
         'defines': [
diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp
index 8b1b498..dc9ef0b 100644
--- a/third_party/libjingle/libjingle_nacl.gyp
+++ b/third_party/libjingle/libjingle_nacl.gyp
@@ -25,7 +25,7 @@
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '<(DEPTH)/third_party/expat/expat_nacl.gyp:expat_nacl',
-        '<(DEPTH)/third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
+        '<(DEPTH)/third_party/openssl/openssl_nacl.gyp:openssl_nacl',
         'libjingle_p2p_constants_nacl',
       ],
       'defines': [
diff --git a/third_party/usrsctp/usrsctp.gyp b/third_party/usrsctp/usrsctp.gyp
index 04952ab..56ea9ea 100644
--- a/third_party/usrsctp/usrsctp.gyp
+++ b/third_party/usrsctp/usrsctp.gyp
@@ -28,7 +28,7 @@
           'SCTP_USE_OPENSSL_SHA1',
         ],
         'dependencies': [
-          '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
+          '<(DEPTH)/third_party/openssl/openssl.gyp:openssl',
         ],
       },
       {  # else use_openssl==0, use NSS.