GN Templates: Move common_inherited_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 c2f48a990c9a4c24e7dfa3a1e611d8d25819f995..59a0163683e1bf511819e655c90cd23edde1c736 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -162,12 +162,13 @@ rtc_opus_dir = "//third_party/opus"
 webrtc_root = get_path_info("../", "abspath")
 
 # Global configuration that should be applied to all WebRTC targets.
-# You normally shouldn't need to # include this in your target as it's
+# 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.
 rtc_common_config = webrtc_root + ":common_config"
+rtc_common_inherited_config = webrtc_root + ":common_inherited_config"

[kjellander_webrtc, 2016/09/05 12:41:31]

Add a separate comment about this one:

Global public 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 set the defines, include paths and
compilation warnings that should be propagated to dependents of the targets
depending on the target having this config.

[ehmaldonado_webrtc, 2016/09/05 12:49:59]

Done.

 
 # Common configs to remove or add in all rtc targets.
 rtc_remove_configs = []
@@ -204,11 +205,16 @@ template("rtc_test") {
                            "*",
                            [
                              "configs",
+                             "public_configs",
                              "suppressed_configs",
                            ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
+    public_configs = [ rtc_common_inherited_config ]
+    if (defined(invoker.public_configs)) {

[kjellander_webrtc, 2016/09/05 12:41:31]

I guess this check is needed because public_configs is normally not set, while
that's not the case for configs (which I guess always has something by default
in GN?).

[ehmaldonado_webrtc, 2016/09/05 12:49:59]

Yes, the default configs is defined in BUILDCONFIG.gn
https://cs.chromium.org/chromium/src/build/config/BUILDCONFIG.gn?l=522

Another approach would be to set as a default public_configs = [] for our
templates, and skip the test here.

+      public_configs += invoker.public_configs
+    }
   }
 }
 
@@ -218,11 +224,16 @@ template("rtc_source_set") {
                            "*",
                            [
                              "configs",
+                             "public_configs",
                              "suppressed_configs",
                            ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
+    public_configs = [ rtc_common_inherited_config ]
+    if (defined(invoker.public_configs)) {
+      public_configs += invoker.public_configs
+    }
   }
 }
 
@@ -233,6 +244,7 @@ template("rtc_executable") {
                            [
                              "deps",
                              "configs",
+                             "public_configs",
                              "suppressed_configs",
                            ])
     configs += invoker.configs
@@ -242,6 +254,10 @@ template("rtc_executable") {
       "//build/config/sanitizers:deps",
     ]
     deps += invoker.deps
+    public_configs = [ rtc_common_inherited_config ]
+    if (defined(invoker.public_configs)) {
+      public_configs += invoker.public_configs
+    }
   }
 }
 
@@ -251,10 +267,15 @@ template("rtc_static_library") {
                            "*",
                            [
                              "configs",
+                             "public_configs",
                              "suppressed_configs",
                            ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
+    public_configs = [ rtc_common_inherited_config ]
+    if (defined(invoker.public_configs)) {
+      public_configs += invoker.public_configs
+    }
   }
 }