Revert of Cleanup webrtc/base/base.gyp

webrtc/base/BUILD.gn

Index: webrtc/base/BUILD.gn
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 6b9a5179af97480d76c9fa69733cac7bd33b7782..411e84863dd71382e4556afcd1895bde8092c8f7 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -132,7 +132,6 @@
     "md5.h",
     "md5digest.cc",
     "md5digest.h",
-    "mod_ops.h",
     "optional.h",
     "platform_file.cc",
     "platform_file.h",
@@ -143,8 +142,6 @@
     "random.h",
     "rate_statistics.cc",
     "rate_statistics.h",
-    "ratetracker.cc",
-    "ratetracker.h",
     "refcount.h",
     "safe_conversions.h",
     "safe_conversions_impl.h",
@@ -187,9 +184,7 @@
   cflags = []
   cflags_cc = []
   libs = []
-  deps = [
-    "..:webrtc_common",
-  ]
+  deps = []
   public_deps = [
     ":rtc_base_approved",
   ]
@@ -262,6 +257,7 @@
     "ipaddress.cc",
     "ipaddress.h",
     "linked_ptr.h",
+    "mathutils.h",
     "messagedigest.cc",
     "messagedigest.h",
     "messagehandler.cc",
@@ -275,15 +271,6 @@
     "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",
@@ -294,8 +281,12 @@
     "proxyinfo.h",
     "ratelimiter.cc",
     "ratelimiter.h",
+    "ratetracker.cc",
+    "ratetracker.h",
     "rtccertificate.cc",
     "rtccertificate.h",
+    "scoped_autorelease_pool.h",
+    "scoped_autorelease_pool.mm",
     "sha1.cc",
     "sha1.h",
     "sha1digest.cc",
@@ -348,7 +339,22 @@
     "worker.h",
   ]
 
+  if (is_posix) {
+    sources += [
+      "ifaddrs-android.h",
+      "ifaddrs_converter.cc",
+      "unixfilesystem.cc",
+      "unixfilesystem.h",
+    ]
+  }
+
   if (build_with_chromium) {
+    deps += [ "..:webrtc_common" ]
+
+    if (is_mac) {
+      sources += [ "macifaddrs_converter.cc" ]
+    }
+
     if (is_win) {
       sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
     }
@@ -368,6 +374,8 @@
       "callback.h",
       "callback.h.pump",
       "fileutils_mock.h",
+      "genericslot.h",
+      "genericslot.h.pump",
       "httpserver.cc",
       "httpserver.h",
       "json.cc",
@@ -395,7 +403,6 @@
       "sec_buffer.h",
       "sslconfig.h",
       "sslroots.h",
-      "testbase64.h",
       "testclient.cc",
       "testclient.h",
       "transformadapter.cc",
@@ -409,6 +416,19 @@
       "windowpickerfactory.h",
     ]
 
+    deps += [ "..:webrtc_common" ]
+
+    if (is_posix) {
+      sources += [
+        "latebindingsymboltable.cc",
+        "latebindingsymboltable.cc.def",
+        "latebindingsymboltable.h",
+        "latebindingsymboltable.h.def",
+        "posix.cc",
+        "posix.h",
+      ]
+    }
+
     if (is_linux) {
       sources += [
         "dbus.cc",
@@ -417,17 +437,6 @@
         "libdbusglibsymboltable.h",
         "linuxfdwalk.c",
         "linuxfdwalk.h",
-      ]
-    }
-
-    if (is_posix) {
-      sources += [
-        "latebindingsymboltable.cc",
-        "latebindingsymboltable.cc.def",
-        "latebindingsymboltable.h",
-        "latebindingsymboltable.h.def",
-        "posix.cc",
-        "posix.h",
       ]
     }
 
@@ -476,10 +485,23 @@
     cflags_cc += [ "-Wno-non-virtual-dtor" ]
   }
 
-  if (rtc_build_ssl) {
-    deps += [ "//third_party/boringssl" ]
-  } else {
-    configs += [ "external_ssl_library" ]
+  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 (is_android) {
@@ -494,15 +516,14 @@
     ]
   }
 
-  if (is_ios || is_mac) {
+  if (is_ios) {
+    all_dependent_configs = [ ":ios_config" ]
+
     sources += [
       "maccocoathreadhelper.h",
       "maccocoathreadhelper.mm",
       "macconversion.cc",
       "macconversion.h",
-      "macifaddrs_converter.cc",
-      "scoped_autorelease_pool.h",
-      "scoped_autorelease_pool.mm",
     ]
   }
 
@@ -530,6 +551,10 @@
 
   if (is_mac) {
     sources += [
+      "maccocoathreadhelper.h",
+      "maccocoathreadhelper.mm",
+      "macconversion.cc",
+      "macconversion.h",
       "macutils.cc",
       "macutils.h",
     ]
@@ -573,19 +598,11 @@
     defines += [ "_CRT_NONSTDC_NO_DEPRECATE" ]
   }
 
-  if (is_posix) {
-    sources += [
-      "ifaddrs_converter.cc",
-      "ifaddrs_converter.h",
-      "unixfilesystem.cc",
-      "unixfilesystem.h",
-    ]
-    if (is_debug) {
-      # The Chromium build/common.gypi defines this for all posix
-      # _except_ for ios & mac.  We want it there as well, e.g.
-      # because ASSERT and friends trigger off of it.
-      defines += [ "_DEBUG" ]
-    }
+  if (is_posix && is_debug) {
+    # The Chromium build/common.gypi defines this for all posix
+    # _except_ for ios & mac.  We want it there as well, e.g.
+    # because ASSERT and friends trigger off of it.
+    defines += [ "_DEBUG" ]
   }
 
   if (is_ios || (is_mac && current_cpu != "x86")) {
@@ -607,8 +624,6 @@
 }
 
 if (is_ios) {
-  all_dependent_configs = [ ":ios_config" ]
-
   source_set("rtc_base_objc") {
     deps = [
       ":rtc_base",