Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: webrtc/build/webrtc.gni

Issue 2311843002: GN Templates: Move common_inherited_config to the template. (Closed)
Patch Set: Added comment for rtc_common_inherited_config. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/call/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/build/webrtc.gni
diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni
index c2f48a990c9a4c24e7dfa3a1e611d8d25819f995..e97d06633b9e46f35ea9977a5d13b575ba290003 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -162,13 +162,20 @@ 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"
+# 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.
+rtc_common_inherited_config = webrtc_root + ":common_inherited_config"
+
# Common configs to remove or add in all rtc targets.
rtc_remove_configs = []
rtc_add_configs = [ rtc_common_config ]
@@ -204,11 +211,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)) {
+ public_configs += invoker.public_configs
+ }
}
}
@@ -218,11 +230,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 +250,7 @@ template("rtc_executable") {
[
"deps",
"configs",
+ "public_configs",
"suppressed_configs",
])
configs += invoker.configs
@@ -242,6 +260,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 +273,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
+ }
}
}
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/call/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698