From 7f7a81991e16ab457c2f2f68ba1431c75381bc34 Mon Sep 17 00:00:00 2001
From: svaldez <svaldez@chromium.org>
Date: Mon, 18 Apr 2016 11:13:11 -0700
Subject: [PATCH] Remove use_openssl from webrtc

This reverts revision 20001 and removes other instances of use_openssl
since Chromium is removing the use_openssl flag and iOS no longer ships
with NSS as of https://crrev.com/387011.

BUG=chromium:601042
R=perkj@webrtc.org, torbjorng@webrtc.org

Review URL: https://codereview.webrtc.org/1884233002

Cr-Commit-Position: refs/heads/master@{#12414}
---
 webrtc/base/BUILD.gn      | 46 ++++++++++++++-------------------------
 webrtc/build/isolate.gypi |  1 -
 webrtc/media/media.gyp    |  9 --------
 webrtc/supplement.gypi    |  3 ---
 4 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 4c2b54c24b..0f7450cfa6 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -10,12 +10,7 @@ import("//build/config/crypto.gni")
 import("//build/config/ui.gni")
 import("../build/webrtc.gni")
 
-# Enable OpenSSL (BoringSSL) for iOS. This is covered in webrtc/supplement.gypi
-# for the GYP build.
 import("//build_overrides/webrtc.gni")
-if (is_ios && !build_with_chromium) {
-  use_openssl = true
-}
 
 config("rtc_base_config") {
   include_dirs = [
@@ -80,11 +75,9 @@ if (is_linux && !build_with_chromium) {
   # Provides the same functionality as the //crypto:platform target, which
   # WebRTC cannot use as we don't sync src/crypto from Chromium.
   group("linux_system_ssl") {
-    if (use_openssl) {
-      deps = [
-        "//third_party/boringssl",
-      ]
-    }
+    deps = [
+      "//third_party/boringssl",
+    ]
   }
 }
 
@@ -276,6 +269,15 @@ static_library("rtc_base") {
     "networkmonitor.cc",
     "networkmonitor.h",
     "nullsocketserver.h",
+    "openssl.h",
+    "openssladapter.cc",
+    "openssladapter.h",
+    "openssldigest.cc",
+    "openssldigest.h",
+    "opensslidentity.cc",
+    "opensslidentity.h",
+    "opensslstreamadapter.cc",
+    "opensslstreamadapter.h",
     "pathutils.cc",
     "pathutils.h",
     "physicalsocketserver.cc",
@@ -466,26 +468,10 @@ static_library("rtc_base") {
     cflags_cc += [ "-Wno-non-virtual-dtor" ]
   }
 
-  # TODO(kjellander): The use_openssl block should really go away in order for
-  # the GN build to be similar to the GYP build. See http://crbug.com/601042 for
-  # more details.
-  if (use_openssl) {
-    if (rtc_build_ssl) {
-      deps += [ "//third_party/boringssl" ]
-    } else {
-      configs += [ "external_ssl_library" ]
-    }
-    sources += [
-      "openssl.h",
-      "openssladapter.cc",
-      "openssladapter.h",
-      "openssldigest.cc",
-      "openssldigest.h",
-      "opensslidentity.cc",
-      "opensslidentity.h",
-      "opensslstreamadapter.cc",
-      "opensslstreamadapter.h",
-    ]
+  if (rtc_build_ssl) {
+    deps += [ "//third_party/boringssl" ]
+  } else {
+    configs += [ "external_ssl_library" ]
   }
 
   if (is_android) {
diff --git a/webrtc/build/isolate.gypi b/webrtc/build/isolate.gypi
index ea44e2cc7f..2d4ea77869 100644
--- a/webrtc/build/isolate.gypi
+++ b/webrtc/build/isolate.gypi
@@ -107,7 +107,6 @@
         '--config-variable', 'use_instrumented_libraries=<(use_instrumented_libraries)',
         '--config-variable',
         'use_prebuilt_instrumented_libraries=<(use_prebuilt_instrumented_libraries)',
-        '--config-variable', 'use_openssl=<(use_openssl)',
         '--config-variable', 'use_ozone=<(use_ozone)',
         '--config-variable', 'use_x11=<(use_x11)',
         '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)',
diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
index f7b68bb037..5c4a24891f 100644
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@@ -303,15 +303,6 @@
           ],
           'conditions': [
             ['OS=="win"', {
-              'conditions': [
-                ['use_openssl==0', {
-                  'dependencies': [
-                    '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
-                    '<(DEPTH)/third_party/nss/nss.gyp:nspr',
-                    '<(DEPTH)/third_party/nss/nss.gyp:nss',
-                  ],
-                }],
-              ],
               'msvs_settings': {
                 'VCLinkerTool': {
                   'AdditionalDependencies': [
diff --git a/webrtc/supplement.gypi b/webrtc/supplement.gypi
index 2cd5400f22..7b2e075d17 100644
--- a/webrtc/supplement.gypi
+++ b/webrtc/supplement.gypi
@@ -13,9 +13,6 @@
     'build_with_chromium': 0,
     'conditions': [
       ['OS=="ios"', {
-        # Default to using BoringSSL on iOS.
-        'use_openssl%': 1,
-
         # Set target_subarch for if not already set. This is needed because the
         # Chromium iOS toolchain relies on target_subarch being set.
         'conditions': [