GN: Refactor webrtc/base/BUILD.gn

webrtc/base/BUILD.gn

Index: webrtc/base/BUILD.gn
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 115f31a0429ce2209e3f4835794a95f82a7784db..6b1ed3ed35373e94c4d782f93f1091ef7f1aa2ab 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -41,34 +41,29 @@ config("openssl_config") {
   ]
 }
 
-config("ios_config") {
-  libs = [
-    "AVFoundation.framework",

[kjellander_webrtc, 2016/04/25 05:37:56]

This no longer exists in base.gyp (only for the _objc targets which don't have
any GN representatives due GN limitations so far).

-    "CFNetwork.framework",
-
-    #"Foundation.framework",  # Already included in //build/config:default_libs.
-    "Security.framework",
-    "SystemConfiguration.framework",
-
-    #"UIKit.framework",  # Already included in //build/config:default_libs.

[kjellander_webrtc, 2016/04/25 05:37:56]

No longer in //build/config:default_libs

-  ]
-}
-
-config("mac_config") {
-  libs = [
-    "Cocoa.framework",
-
-    #"Foundation.framework",  # Already included in //build/config:default_libs.

[kjellander_webrtc, 2016/04/25 05:37:56]

Include these again (turns out it was a very good idea to leave them in here
commented when I initially wrote this).

-    #"IOKit.framework",  # Already included in //build/config:default_libs.
-    #"Security.framework",  # Already included in //build/config:default_libs.
-    "SystemConfiguration.framework",
-  ]
-}
-
-config("mac_x86_config") {
-  libs = [
-    #"Carbon.framework",  # Already included in //build/config:default_libs.
-  ]
+config("rtc_base_all_dependent_config") {
+  if (is_ios) {
+    libs = [
+      "CFNetwork.framework",
+
+      #"Foundation.framework",  # Already in //build/config:default_libs.
+      "Security.framework",
+      "SystemConfiguration.framework",
+      "UIKit.framework",  # Already in //build/config:default_libs.
+    ]
+  }
+  if (is_mac) {
+    libs = [
+      "Cocoa.framework",
+      "Foundation.framework",
+      "IOKit.framework",
+      "Security.framework",
+      "SystemConfiguration.framework",
+    ]
+    if (current_cpu == "x86") {
+      libs = [ "Carbon.framework" ]  # Already in //build/config:default_libs.
+    }
+  }
 }
 
 if (is_linux && !build_with_chromium) {
@@ -202,6 +197,8 @@ static_library("rtc_base") {
     ":rtc_base_config",
   ]
 
+  all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
+
   defines = [ "LOGGING=1" ]
 
   sources = [
@@ -488,9 +485,6 @@ static_library("rtc_base") {
   }
 
   if (is_ios || is_mac) {
-    if (is_ios) {
-      all_dependent_configs = [ ":ios_config" ]
-    }
     sources += [
       "maccocoathreadhelper.h",
       "maccocoathreadhelper.mm",
@@ -529,12 +523,6 @@ static_library("rtc_base") {
       "macutils.cc",
       "macutils.h",
     ]
-
-    all_dependent_configs = [ ":mac_config" ]
-
-    if (current_cpu == "x86") {
-      all_dependent_configs += [ ":mac_x86_config" ]
-    }
   }
 
   if (is_win) {