GN Templates: Move common_config to the template.

webrtc/build/webrtc.gni

Index: webrtc/build/webrtc.gni
diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni
index 26752ca3f5686f62a81d3b35e674503519800dea..ca5e7fcee2baf689091c03bfd4d30ef2b8fd64d0 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -161,27 +161,29 @@ rtc_opus_dir = "//third_party/opus"
 # different subdirectories.
 webrtc_root = get_path_info("../", "abspath")
 
+rtc_common_config = webrtc_root + ":common_config"

[kjellander_webrtc, 2016/09/05 06:50:28]

Let's document this one properly. Something like this:

# Global configuration that should be applied to all WebRTC targets. You
normally shouldn't need to
# include this in your target as it's automatically included when using the
rtc_* templates.
# It sets defines, include paths and compilation warnings accordingly, both for
WebRTC
# stand-alone builds and for the scenario when WebRTC native code is built as
part of Chromium.

+
 # Common configs to remove or add in all rtc targets.
 rtc_remove_configs = []
-rtc_add_configs = []
+rtc_add_configs = [ rtc_common_config ]
 
 set_defaults("rtc_test") {
-  configs = []
+  configs = rtc_add_configs
   suppressed_configs = []
 }
 
 set_defaults("rtc_source_set") {
-  configs = []
+  configs = rtc_add_configs
   suppressed_configs = []
 }
 
 set_defaults("rtc_executable") {
-  configs = []
+  configs = rtc_add_configs
   suppressed_configs = []
 }
 
 set_defaults("rtc_static_library") {
-  configs = []
+  configs = rtc_add_configs
   suppressed_configs = []
 }
 
@@ -194,7 +196,6 @@ template("rtc_test") {
                              "suppressed_configs",
                            ])
     configs += invoker.configs
-    configs += rtc_add_configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
   }
@@ -209,7 +210,6 @@ template("rtc_source_set") {
                              "suppressed_configs",
                            ])
     configs += invoker.configs
-    configs += rtc_add_configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
   }
@@ -225,7 +225,6 @@ template("rtc_executable") {
                              "suppressed_configs",
                            ])
     configs += invoker.configs
-    configs += rtc_add_configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
     deps = [
@@ -244,7 +243,6 @@ template("rtc_static_library") {
                              "suppressed_configs",
                            ])
     configs += invoker.configs
-    configs += rtc_add_configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
   }