Reland of Cleanup webrtc/base/base.gyp

webrtc/base/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("//build/config/crypto.gni")
 import("//build/config/ui.gni")
@@ skipping 114 matching lines @@
     "event.cc",
     "event.h",
     "event_tracer.cc",
     "event_tracer.h",
     "exp_filter.cc",
     "exp_filter.h",
     "md5.cc",
     "md5.h",
     "md5digest.cc",
     "md5digest.h",
+    "mod_ops.h",
     "optional.h",
     "platform_file.cc",
     "platform_file.h",
     "platform_thread.cc",
     "platform_thread.h",
     "platform_thread_types.h",
     "random.cc",
     "random.h",
     "rate_statistics.cc",
     "rate_statistics.h",
+    "ratetracker.cc",
+    "ratetracker.h",
     "refcount.h",
     "safe_conversions.h",
     "safe_conversions_impl.h",
     "scoped_ptr.h",
     "scoped_ref_ptr.h",
     "stringencode.cc",
     "stringencode.h",
     "stringutils.cc",
     "stringutils.h",
     "swap_queue.h",
@@ skipping 22 matching lines @@
       "logging.cc",
       "logging.h",
     ]
   }
 }
 
 static_library("rtc_base") {
   cflags = []
   cflags_cc = []
   libs = []
-  deps = []
+  deps = [
+    "..:webrtc_common",
+  ]
   public_deps = [
     ":rtc_base_approved",
   ]
 
   configs += [
     "..:common_config",
     ":openssl_config",
     ":rtc_base_config",
   ]
 
@@ skipping 52 matching lines @@
     "httpclient.h",
     "httpcommon-inl.h",
     "httpcommon.cc",
     "httpcommon.h",
     "httprequest.cc",
     "httprequest.h",
     "iosfilesystem.mm",
     "ipaddress.cc",
     "ipaddress.h",
     "linked_ptr.h",
-    "mathutils.h",
     "messagedigest.cc",
     "messagedigest.h",
     "messagehandler.cc",
     "messagehandler.h",
     "messagequeue.cc",
     "messagequeue.h",
     "nethelpers.cc",
     "nethelpers.h",
     "network.cc",
     "network.h",
     "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",
     "physicalsocketserver.h",
     "proxydetect.cc",
     "proxydetect.h",
     "proxyinfo.cc",
     "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",
     "sha1digest.h",
     "sharedexclusivelock.cc",
     "sharedexclusivelock.h",
     "signalthread.cc",
     "signalthread.h",
     "sigslot.cc",
     "sigslot.h",
@@ skipping 32 matching lines @@
     "thread.cc",
     "thread.h",
     "timing.cc",
     "timing.h",
     "urlencode.cc",
     "urlencode.h",
     "worker.cc",
     "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" ]
     }
 
     include_dirs = [
       "../../webrtc_overrides",
       "../../boringssl/src/include",
     ]
 
     public_configs += [ ":rtc_base_chromium_config" ]
   } else {
     sources += [
       "bandwidthsmoother.cc",
       "bandwidthsmoother.h",
       "bind.h",
-      "bind.h.pump",
       "callback.h",
-      "callback.h.pump",
       "fileutils_mock.h",
-      "genericslot.h",
-      "genericslot.h.pump",
       "httpserver.cc",
       "httpserver.h",
       "json.cc",
       "json.h",
       "logsinks.cc",
       "logsinks.h",
       "mathutils.h",
       "multipart.cc",
       "multipart.h",
       "natserver.cc",
       "natserver.h",
       "natsocketfactory.cc",
       "natsocketfactory.h",
       "nattypes.cc",
       "nattypes.h",
       "optionsfile.cc",
       "optionsfile.h",
       "profiler.cc",
       "profiler.h",
       "proxyserver.cc",
       "proxyserver.h",
       "referencecountedsingletonfactory.h",
       "rollingaccumulator.h",
       "scopedptrcollection.h",
       "sec_buffer.h",
       "sslconfig.h",
       "sslroots.h",
+      "testbase64.h",
       "testclient.cc",
       "testclient.h",
       "transformadapter.cc",
       "transformadapter.h",
       "versionparsing.cc",
       "versionparsing.h",
       "virtualsocketserver.cc",
       "virtualsocketserver.h",
       "window.h",
       "windowpicker.h",
       "windowpickerfactory.h",
     ]
 
-    deps += [ "..:webrtc_common" ]
+    if (is_linux) {
+      sources += [
+        "dbus.cc",
+        "dbus.h",
+        "libdbusglibsymboltable.cc",
+        "libdbusglibsymboltable.h",
+        "linuxfdwalk.c",
+        "linuxfdwalk.h",
+      ]
+    }
 
     if (is_posix) {
       sources += [
         "latebindingsymboltable.cc",
         "latebindingsymboltable.cc.def",
         "latebindingsymboltable.h",
         "latebindingsymboltable.h.def",
         "posix.cc",
         "posix.h",
       ]
     }
 
-    if (is_linux) {
-      sources += [
-        "dbus.cc",
-        "dbus.h",
-        "libdbusglibsymboltable.cc",
-        "libdbusglibsymboltable.h",
-        "linuxfdwalk.c",
-        "linuxfdwalk.h",
-      ]
-    }
-
     if (is_mac) {
       sources += [
         "macasyncsocket.cc",
         "macasyncsocket.h",
         "maccocoasocketserver.h",
         "maccocoasocketserver.mm",
         "macsocketserver.cc",
         "macsocketserver.h",
         "macwindowpicker.cc",
         "macwindowpicker.h",
@@ skipping 25 matching lines @@
 
   # TODO(henrike): issue 3307, make rtc_base build with the Chromium default
   # compiler settings.
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
   if (!is_win) {
     cflags += [ "-Wno-uninitialized" ]
     cflags_cc += [ "-Wno-non-virtual-dtor" ]
   }
 
-  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) {
     sources += [
       "ifaddrs-android.cc",
       "ifaddrs-android.h",
     ]
 
     libs += [
       "log",
       "GLESv2",
     ]
   }
 
-  if (is_ios) {
-    all_dependent_configs = [ ":ios_config" ]
-
+  if (is_ios || is_mac) {
     sources += [
       "maccocoathreadhelper.h",
       "maccocoathreadhelper.mm",
       "macconversion.cc",
       "macconversion.h",
+      "macifaddrs_converter.cc",
+      "scoped_autorelease_pool.h",
+      "scoped_autorelease_pool.mm",
     ]
   }
 
   if (use_x11) {
     sources += [
       "x11windowpicker.cc",
       "x11windowpicker.h",
     ]
     libs += [
       "dl",
       "rt",
       "Xext",
       "X11",
       "Xcomposite",
       "Xrender",
     ]
   }
 
   if (is_linux) {
     libs += [
       "dl",
       "rt",
     ]
   }
 
   if (is_mac) {
     sources += [
-      "maccocoathreadhelper.h",
-      "maccocoathreadhelper.mm",
-      "macconversion.cc",
-      "macconversion.h",
       "macutils.cc",
       "macutils.h",
     ]
 
     all_dependent_configs = [ ":mac_config" ]
 
     if (current_cpu == "x86") {
       all_dependent_configs += [ ":mac_x86_config" ]
     }
   }
@@ skipping 23 matching lines @@
 
     cflags += [
       # Suppress warnings about WIN32_LEAN_AND_MEAN.
       "/wd4005",
       "/wd4703",
     ]
 
     defines += [ "_CRT_NONSTDC_NO_DEPRECATE" ]
   }
 
-  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_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_ios || (is_mac && current_cpu != "x86")) {
     defines += [ "CARBON_DEPRECATED=YES" ]
   }
 
   if (is_linux || is_android) {
     sources += [
       "linux.cc",
       "linux.h",
     ]
   }
 
   if (is_nacl) {
     deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
     defines += [ "timezone=_timezone" ]
     sources -= [ "ifaddrs_converter.cc" ]
   }
 }
 
 if (is_ios) {
+  all_dependent_configs = [ ":ios_config" ]
+
   source_set("rtc_base_objc") {
     deps = [
       ":rtc_base",
     ]
     cflags = [ "-fobjc-arc" ]
     configs += [ "..:common_config" ]
     public_configs = [ "..:common_inherited_config" ]
 
     sources = [
       "objc/NSString+StdString.h",
@@ skipping 17 matching lines @@
       "objc/RTCUIApplication.mm",
     ]
   }
 }
 
 source_set("gtest_prod") {
   sources = [
     "gtest_prod_util.h",
   ]
 }