mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
GN rtc_* templates: Forward global "visibility"
`forward_variables_from(invoker, "*")` forwards all locally declared variables, but not global variables. This means that while setting `visibility` locally in an rtc_* build target works fine, it does not currently work to set `visibility` globally for all build targets in a file. Fix this by manually forwarding `visibility`. BUG=webrtc:8254, webrtc:8255 Change-Id: I9e1a5f8ac9cb5991fff2af7c094fe677e1483964 Reviewed-on: https://webrtc-review.googlesource.com/10806 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20305}
This commit is contained in:
parent
6fa6dd4f83
commit
138d4ac54d
1 changed files with 12 additions and 0 deletions
12
webrtc.gni
12
webrtc.gni
|
@ -267,7 +267,9 @@ template("rtc_test") {
|
||||||
"configs",
|
"configs",
|
||||||
"public_configs",
|
"public_configs",
|
||||||
"suppressed_configs",
|
"suppressed_configs",
|
||||||
|
"visibility",
|
||||||
])
|
])
|
||||||
|
forward_variables_from(invoker, [ "visibility" ])
|
||||||
configs += invoker.configs
|
configs += invoker.configs
|
||||||
configs -= rtc_remove_configs
|
configs -= rtc_remove_configs
|
||||||
configs -= invoker.suppressed_configs
|
configs -= invoker.suppressed_configs
|
||||||
|
@ -290,7 +292,9 @@ template("rtc_source_set") {
|
||||||
"configs",
|
"configs",
|
||||||
"public_configs",
|
"public_configs",
|
||||||
"suppressed_configs",
|
"suppressed_configs",
|
||||||
|
"visibility",
|
||||||
])
|
])
|
||||||
|
forward_variables_from(invoker, [ "visibility" ])
|
||||||
configs += invoker.configs
|
configs += invoker.configs
|
||||||
configs -= rtc_remove_configs
|
configs -= rtc_remove_configs
|
||||||
configs -= invoker.suppressed_configs
|
configs -= invoker.suppressed_configs
|
||||||
|
@ -310,7 +314,9 @@ template("rtc_executable") {
|
||||||
"configs",
|
"configs",
|
||||||
"public_configs",
|
"public_configs",
|
||||||
"suppressed_configs",
|
"suppressed_configs",
|
||||||
|
"visibility",
|
||||||
])
|
])
|
||||||
|
forward_variables_from(invoker, [ "visibility" ])
|
||||||
configs += invoker.configs
|
configs += invoker.configs
|
||||||
configs -= rtc_remove_configs
|
configs -= rtc_remove_configs
|
||||||
configs -= invoker.suppressed_configs
|
configs -= invoker.suppressed_configs
|
||||||
|
@ -334,7 +340,9 @@ template("rtc_static_library") {
|
||||||
"configs",
|
"configs",
|
||||||
"public_configs",
|
"public_configs",
|
||||||
"suppressed_configs",
|
"suppressed_configs",
|
||||||
|
"visibility",
|
||||||
])
|
])
|
||||||
|
forward_variables_from(invoker, [ "visibility" ])
|
||||||
configs += invoker.configs
|
configs += invoker.configs
|
||||||
configs -= rtc_remove_configs
|
configs -= rtc_remove_configs
|
||||||
configs -= invoker.suppressed_configs
|
configs -= invoker.suppressed_configs
|
||||||
|
@ -353,7 +361,9 @@ template("rtc_shared_library") {
|
||||||
"configs",
|
"configs",
|
||||||
"public_configs",
|
"public_configs",
|
||||||
"suppressed_configs",
|
"suppressed_configs",
|
||||||
|
"visibility",
|
||||||
])
|
])
|
||||||
|
forward_variables_from(invoker, [ "visibility" ])
|
||||||
configs += invoker.configs
|
configs += invoker.configs
|
||||||
configs -= rtc_remove_configs
|
configs -= rtc_remove_configs
|
||||||
configs -= invoker.suppressed_configs
|
configs -= invoker.suppressed_configs
|
||||||
|
@ -378,7 +388,9 @@ if (is_ios) {
|
||||||
"configs",
|
"configs",
|
||||||
"public_configs",
|
"public_configs",
|
||||||
"suppressed_configs",
|
"suppressed_configs",
|
||||||
|
"visibility",
|
||||||
])
|
])
|
||||||
|
forward_variables_from(invoker, [ "visibility" ])
|
||||||
configs += invoker.configs
|
configs += invoker.configs
|
||||||
configs -= rtc_remove_configs
|
configs -= rtc_remove_configs
|
||||||
configs -= invoker.suppressed_configs
|
configs -= invoker.suppressed_configs
|
||||||
|
|
Loading…
Reference in a new issue