commit 97a659d3b43f471cacfc150113244c198940d1a1
author Fabrice de Gans-Riberi <fdegans@google.com> Mon Jul 20 18:18:30 2020 -0700
committer Fabrice de Gans-Riberi <fdegans@google.com> Tue Jul 21 17:53:59 2020 +0000
tree 83a93df162d177ff4378f07757b8e029ba8bfef3
parent f33d953b1aa4d6e21169fea9e55ee7bfd37ee293

[icu] Track deleted blocks in the Fuchsia copy.

This re-adds and comments out deleted blocks in the Fuchsia copy of
ICU. The purpose of tracking deleted blocks is to simplify the
upstream merging process.

Bug: 56356
Change-Id: I06e6e3897993ef0d77a32ec88293328df5204bf5
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/icu/+/408802
Reviewed-by: Filip Filmar <fmil@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 6e31577..0017c58 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -9,6 +9,12 @@
   import("//build/config/android/rules.gni")
 }
 
+# <fuchsia-icu>
+# if (is_mac) {
+#  import("//build/config/sanitizers/sanitizers.gni")
+# }
+# </fuchsia-icu>
+
 assert(!icu_disable_thin_archive || !is_component_build,
        "icu_disable_thin_archive only works in static library builds")
 
@@ -641,6 +647,14 @@
   configs += [ ":icu_code" ]
   public_configs = [ ":icu_config" ]
 
+  # <fuchsia-icu>
+  #  if (is_fuchsia) {
+  #    # Fuchsia puts its own libicui18n.so in /system/lib where we need to put our
+  #    # .so when doing component builds, so we need to give this a different name.
+  #    output_name = "icui18n_cr"
+  #  }
+  # </fuchsia-icu>
+
   # Make icu into a standalone static library. Currently This is only useful on
   # Chrome OS.
   if (icu_disable_thin_archive) {
@@ -1095,6 +1109,14 @@
   }
 
   defines += [ "U_ICUDATAENTRY_IN_COMMON" ]
+
+  # <fuchsia-icu>
+  #  if (is_fuchsia) {
+  #    # Fuchsia puts its own libicui18n.so in /system/lib where we need to put our
+  #    # .so when doing component builds, so we need to give this a different name.
+  #    output_name = "icuuc_cr"
+  #  }
+  # </fuchsia-icu>
 }
 
 if (is_android && enable_java_templates) {