From 138d4ac54d9eebbdbe0469f301ec64cbf6731af3 Mon Sep 17 00:00:00 2001
From: Karl Wiberg <kwiberg@webrtc.org>
Date: Mon, 16 Oct 2017 11:16:19 +0200
Subject: [PATCH] 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}
---
 webrtc.gni | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/webrtc.gni b/webrtc.gni
index b36352ddbe..de1c5e97b7 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -267,7 +267,9 @@ template("rtc_test") {
                              "configs",
                              "public_configs",
                              "suppressed_configs",
+                             "visibility",
                            ])
+    forward_variables_from(invoker, [ "visibility" ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
@@ -290,7 +292,9 @@ template("rtc_source_set") {
                              "configs",
                              "public_configs",
                              "suppressed_configs",
+                             "visibility",
                            ])
+    forward_variables_from(invoker, [ "visibility" ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
@@ -310,7 +314,9 @@ template("rtc_executable") {
                              "configs",
                              "public_configs",
                              "suppressed_configs",
+                             "visibility",
                            ])
+    forward_variables_from(invoker, [ "visibility" ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
@@ -334,7 +340,9 @@ template("rtc_static_library") {
                              "configs",
                              "public_configs",
                              "suppressed_configs",
+                             "visibility",
                            ])
+    forward_variables_from(invoker, [ "visibility" ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
@@ -353,7 +361,9 @@ template("rtc_shared_library") {
                              "configs",
                              "public_configs",
                              "suppressed_configs",
+                             "visibility",
                            ])
+    forward_variables_from(invoker, [ "visibility" ])
     configs += invoker.configs
     configs -= rtc_remove_configs
     configs -= invoker.suppressed_configs
@@ -378,7 +388,9 @@ if (is_ios) {
                                "configs",
                                "public_configs",
                                "suppressed_configs",
+                               "visibility",
                              ])
+      forward_variables_from(invoker, [ "visibility" ])
       configs += invoker.configs
       configs -= rtc_remove_configs
       configs -= invoker.suppressed_configs