commit 014c08a1e8b74eaffcd44a319dfc4893beda9e08
author Drew Fisher <zarvox@google.com> Tue Sep 22 15:21:58 2020 -0700
committer Drew Fisher <zarvox@google.com> Tue Sep 22 15:22:38 2020 -0700
tree d7f25162ced4a27d7272b85488bf3e7354026ce9
parent 1be04b01dad80e4d77ddf711b2942288039f56b6
parent dde6dc83dd036037252b201b99ec24e3288214ec

[roll] Roll 1 change from upstream d7eebbfb..dde6dc83

[dde6dc83] [build] Clean up no_rtti config handling

Change-Id: I9438f654fba109b70a29b1982443e45081f595ca

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 80dc070..07b7815 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -150,7 +150,11 @@
                              ])
       assert(fuchsia_output_name_postfix == "")
 
-      # ICU uses RTTI, replace the default "no rtti" config.
+      # ICU uses RTTI, replace the default "no rtti" config (if applied).
+      configs += [
+        "//build/config:no_rtti",
+        "//build/config:symbol_visibility_hidden",
+      ]
       configs -= [
         "//build/config:no_rtti",
         "//build/config:symbol_visibility_hidden",
@@ -180,7 +184,11 @@
         assert(fuchsia_output_name_postfix == "")
       }
 
-      # ICU uses RTTI, replace the default "no rtti" config.
+      # ICU uses RTTI, replace the default "no rtti" config (if applied).
+      configs += [
+        "//build/config/compiler:no_rtti",
+        "//build/config/compiler:chromium_code",
+      ]
       configs -= [
         "//build/config/compiler:no_rtti",
         "//build/config/compiler:chromium_code",