Roll ICU to d7eebbfb

d7eebbfb icu: Expand is_linux to is_linux || is_chromeos.
83b2ac66 [fuchsia] Bring more changes from the Fuchsia copy
368b1cb1 Upstream Fuchsia changes in build file

Bug: 56362
Change-Id: I71013cf8c4e2da94c61a5d4c531cf2dd400b32f1
diff --git a/BUILD.gn b/BUILD.gn
index 6498fc4..80dc070 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -4,16 +4,15 @@
 
 import("//build/config/host_byteorder.gni")
 import("//third_party/icu/config.gni")
+import("//third_party/icu/sources.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-# <fuchsia-icu>
 if (is_mac && !icu_is_in_fuchsia) {
- import("//build/config/sanitizers/sanitizers.gni")
+  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")
@@ -92,37 +91,37 @@
       "/wd4005",  # Macro redefinition.
       "/wd4068",  # Unknown pragmas.
       "/wd4267",  # Conversion from size_t on 64-bits.
-      "/utf-8",   # ICU source files are in UTF-8.
+      "/utf-8",  # ICU source files are in UTF-8.
     ]
-  } else if (is_linux || is_android || icu_is_in_fuchsia) {
-    cflags += [
-      "-Wno-unused-function",
-    ]
+  } else if (is_linux || is_chromeos || is_android || icu_is_in_fuchsia) {
+    cflags += [ "-Wno-unused-function" ]
   }
   if (is_clang) {
     cflags += [
       # ICU has some code with the pattern:
       #   if (found = uprv_getWindowsTimeZoneInfo(...))
       "-Wno-parentheses",
+
       # ucnv2022.cpp contains three functions that are only used when
       # certain preprocessor defines are set.
       # unistr.cpp also has an unused function for non-component builds.
       "-Wno-unused-function",
+
       # putil.cpp contains unused variables when building for iOS simulators.
       "-Wno-unused-variable",
     ]
   }
-  if (is_clang || is_linux || is_android || icu_is_in_fuchsia) {
+  if (is_clang || is_linux || is_chromeos || is_android || icu_is_in_fuchsia) {
     cflags += [
       # ICU uses its own deprecated functions.
       "-Wno-deprecated-declarations",
     ]
   }
-  # <fuchsia-icu>
   if (icu_is_in_fuchsia) {
     cflags += [
       # Disable spurious thread safety errors in umutex.cpp
       "-Wno-thread-safety",
+
       # Can probably remove the below after
       # https://unicode-org.atlassian.net/projects/ICU/issues/ICU-20869
       # is fixed.
@@ -130,570 +129,98 @@
       "-Wno-conversion",
     ]
   }
-  # </fuchsia-icu>
 }
 
 # Config used to set default visibility to hidden.
 config("visibility_hidden") {
   cflags = []
-  if (is_mac || is_linux || is_android) {
+  if (is_mac || is_linux || is_chromeos || is_android) {
     cflags += [ "-fvisibility=hidden" ]
   }
 }
 
-template("generate_icui18n") {
-  assert(defined(invoker.icuuc_deps), "Need the 'icuuc_deps' parameter.")
-  icuuc_deps = invoker.icuuc_deps
-  fuchsia_output_name_postfix = ""
-  if (defined(invoker.fuchsia_output_name_postfix)) {
-    fuchsia_output_name_postfix = invoker.fuchsia_output_name_postfix
-  }
-  extra_configs = []
-  if (defined(invoker.extra_configs)) {
-    extra_configs += invoker.extra_configs
-  }
-  # <fuchsia-icu>
-  target(default_library_type, target_name) {
-  # </fuchsia-icu>
-    # find  source/i18n -maxdepth 1  ! -type d  | egrep  '\.(c|cpp|h)$' |\
-    # sort | sed 's/^\(.*\)$/    "\1",/'
-    sources = [
-      # I18N_SRC_START
-      "source/i18n/alphaindex.cpp",
-      "source/i18n/anytrans.cpp",
-      "source/i18n/anytrans.h",
-      "source/i18n/astro.cpp",
-      "source/i18n/astro.h",
-      "source/i18n/basictz.cpp",
-      "source/i18n/bocsu.cpp",
-      "source/i18n/bocsu.h",
-      "source/i18n/brktrans.cpp",
-      "source/i18n/brktrans.h",
-      "source/i18n/buddhcal.cpp",
-      "source/i18n/buddhcal.h",
-      "source/i18n/calendar.cpp",
-      "source/i18n/casetrn.cpp",
-      "source/i18n/casetrn.h",
-      "source/i18n/cecal.cpp",
-      "source/i18n/cecal.h",
-      "source/i18n/chnsecal.cpp",
-      "source/i18n/chnsecal.h",
-      "source/i18n/choicfmt.cpp",
-      "source/i18n/coleitr.cpp",
-      "source/i18n/collationbuilder.cpp",
-      "source/i18n/collationbuilder.h",
-      "source/i18n/collationcompare.cpp",
-      "source/i18n/collationcompare.h",
-      "source/i18n/collation.cpp",
-      "source/i18n/collationdatabuilder.cpp",
-      "source/i18n/collationdatabuilder.h",
-      "source/i18n/collationdata.cpp",
-      "source/i18n/collationdata.h",
-      "source/i18n/collationdatareader.cpp",
-      "source/i18n/collationdatareader.h",
-      "source/i18n/collationdatawriter.cpp",
-      "source/i18n/collationdatawriter.h",
-      "source/i18n/collationfastlatinbuilder.cpp",
-      "source/i18n/collationfastlatinbuilder.h",
-      "source/i18n/collationfastlatin.cpp",
-      "source/i18n/collationfastlatin.h",
-      "source/i18n/collationfcd.cpp",
-      "source/i18n/collationfcd.h",
-      "source/i18n/collation.h",
-      "source/i18n/collationiterator.cpp",
-      "source/i18n/collationiterator.h",
-      "source/i18n/collationkeys.cpp",
-      "source/i18n/collationkeys.h",
-      "source/i18n/collationroot.cpp",
-      "source/i18n/collationrootelements.cpp",
-      "source/i18n/collationrootelements.h",
-      "source/i18n/collationroot.h",
-      "source/i18n/collationruleparser.cpp",
-      "source/i18n/collationruleparser.h",
-      "source/i18n/collationsets.cpp",
-      "source/i18n/collationsets.h",
-      "source/i18n/collationsettings.cpp",
-      "source/i18n/collationsettings.h",
-      "source/i18n/collationtailoring.cpp",
-      "source/i18n/collationtailoring.h",
-      "source/i18n/collationweights.cpp",
-      "source/i18n/collationweights.h",
-      "source/i18n/coll.cpp",
-      "source/i18n/collunsafe.h",
-      "source/i18n/compactdecimalformat.cpp",
-      "source/i18n/coptccal.cpp",
-      "source/i18n/coptccal.h",
-      "source/i18n/cpdtrans.cpp",
-      "source/i18n/cpdtrans.h",
-      "source/i18n/csdetect.cpp",
-      "source/i18n/csdetect.h",
-      "source/i18n/csmatch.cpp",
-      "source/i18n/csmatch.h",
-      "source/i18n/csr2022.cpp",
-      "source/i18n/csr2022.h",
-      "source/i18n/csrecog.cpp",
-      "source/i18n/csrecog.h",
-      "source/i18n/csrmbcs.cpp",
-      "source/i18n/csrmbcs.h",
-      "source/i18n/csrsbcs.cpp",
-      "source/i18n/csrsbcs.h",
-      "source/i18n/csrucode.cpp",
-      "source/i18n/csrucode.h",
-      "source/i18n/csrutf8.cpp",
-      "source/i18n/csrutf8.h",
-      "source/i18n/curramt.cpp",
-      "source/i18n/currfmt.cpp",
-      "source/i18n/currfmt.h",
-      "source/i18n/currpinf.cpp",
-      "source/i18n/currunit.cpp",
-      "source/i18n/dangical.cpp",
-      "source/i18n/dangical.h",
-      "source/i18n/datefmt.cpp",
-      "source/i18n/dayperiodrules.cpp",
-      "source/i18n/dayperiodrules.h",
-      "source/i18n/dcfmtsym.cpp",
-      "source/i18n/decContext.cpp",
-      "source/i18n/decContext.h",
-      "source/i18n/decimfmt.cpp",
-      "source/i18n/decNumber.cpp",
-      "source/i18n/decNumber.h",
-      "source/i18n/decNumberLocal.h",
-      "source/i18n/double-conversion-bignum.cpp",
-      "source/i18n/double-conversion-bignum-dtoa.cpp",
-      "source/i18n/double-conversion-bignum-dtoa.h",
-      "source/i18n/double-conversion-bignum.h",
-      "source/i18n/double-conversion-cached-powers.cpp",
-      "source/i18n/double-conversion-cached-powers.h",
-      "source/i18n/double-conversion-diy-fp.h",
-      "source/i18n/double-conversion-double-to-string.cpp",
-      "source/i18n/double-conversion-double-to-string.h",
-      "source/i18n/double-conversion-fast-dtoa.cpp",
-      "source/i18n/double-conversion-fast-dtoa.h",
-      "source/i18n/double-conversion.h",
-      "source/i18n/double-conversion-ieee.h",
-      "source/i18n/double-conversion-string-to-double.cpp",
-      "source/i18n/double-conversion-string-to-double.h",
-      "source/i18n/double-conversion-strtod.cpp",
-      "source/i18n/double-conversion-strtod.h",
-      "source/i18n/double-conversion-utils.h",
-      "source/i18n/dtfmtsym.cpp",
-      "source/i18n/dt_impl.h",
-      "source/i18n/dtitvfmt.cpp",
-      "source/i18n/dtitv_impl.h",
-      "source/i18n/dtitvinf.cpp",
-      "source/i18n/dtptngen.cpp",
-      "source/i18n/dtptngen_impl.h",
-      "source/i18n/dtrule.cpp",
-      "source/i18n/erarules.cpp",
-      "source/i18n/erarules.h",
-      "source/i18n/esctrn.cpp",
-      "source/i18n/esctrn.h",
-      "source/i18n/ethpccal.cpp",
-      "source/i18n/ethpccal.h",
-      "source/i18n/fmtable_cnv.cpp",
-      "source/i18n/fmtable.cpp",
-      "source/i18n/fmtableimp.h",
-      "source/i18n/format.cpp",
-      "source/i18n/formatted_string_builder.cpp",
-      "source/i18n/formatted_string_builder.h",
-      "source/i18n/formattedval_impl.h",
-      "source/i18n/formattedval_iterimpl.cpp",
-      "source/i18n/formattedval_sbimpl.cpp",
-      "source/i18n/formattedvalue.cpp",
-      "source/i18n/fphdlimp.cpp",
-      "source/i18n/fphdlimp.h",
-      "source/i18n/fpositer.cpp",
-      "source/i18n/funcrepl.cpp",
-      "source/i18n/funcrepl.h",
-      "source/i18n/gender.cpp",
-      "source/i18n/gregocal.cpp",
-      "source/i18n/gregoimp.cpp",
-      "source/i18n/gregoimp.h",
-      "source/i18n/hebrwcal.cpp",
-      "source/i18n/hebrwcal.h",
-      "source/i18n/indiancal.cpp",
-      "source/i18n/indiancal.h",
-      "source/i18n/inputext.cpp",
-      "source/i18n/inputext.h",
-      "source/i18n/islamcal.cpp",
-      "source/i18n/islamcal.h",
-      "source/i18n/japancal.cpp",
-      "source/i18n/japancal.h",
-      "source/i18n/listformatter.cpp",
-      "source/i18n/measfmt.cpp",
-      "source/i18n/measunit.cpp",
-      "source/i18n/measunit_extra.cpp",
-      "source/i18n/measunit_impl.h",
-      "source/i18n/measure.cpp",
-      "source/i18n/msgfmt.cpp",
-      "source/i18n/msgfmt_impl.h",
-      "source/i18n/name2uni.cpp",
-      "source/i18n/name2uni.h",
-      "source/i18n/nfrlist.h",
-      "source/i18n/nfrs.cpp",
-      "source/i18n/nfrs.h",
-      "source/i18n/nfrule.cpp",
-      "source/i18n/nfrule.h",
-      "source/i18n/nfsubs.cpp",
-      "source/i18n/nfsubs.h",
-      "source/i18n/nortrans.cpp",
-      "source/i18n/nortrans.h",
-      "source/i18n/nounit.cpp",
-      "source/i18n/nultrans.cpp",
-      "source/i18n/nultrans.h",
-      "source/i18n/number_affixutils.cpp",
-      "source/i18n/number_affixutils.h",
-      "source/i18n/number_asformat.cpp",
-      "source/i18n/number_asformat.h",
-      "source/i18n/number_capi.cpp",
-      "source/i18n/number_compact.cpp",
-      "source/i18n/number_compact.h",
-      "source/i18n/number_currencysymbols.cpp",
-      "source/i18n/number_currencysymbols.h",
-      "source/i18n/number_decimalquantity.cpp",
-      "source/i18n/number_decimalquantity.h",
-      "source/i18n/number_decimfmtprops.cpp",
-      "source/i18n/number_decimfmtprops.h",
-      "source/i18n/number_decnum.h",
-      "source/i18n/number_fluent.cpp",
-      "source/i18n/number_formatimpl.cpp",
-      "source/i18n/number_formatimpl.h",
-      "source/i18n/number_grouping.cpp",
-      "source/i18n/number_integerwidth.cpp",
-      "source/i18n/number_longnames.cpp",
-      "source/i18n/number_longnames.h",
-      "source/i18n/number_mapper.cpp",
-      "source/i18n/number_mapper.h",
-      "source/i18n/number_microprops.h",
-      "source/i18n/number_modifiers.cpp",
-      "source/i18n/number_modifiers.h",
-      "source/i18n/number_multiplier.cpp",
-      "source/i18n/number_multiplier.h",
-      "source/i18n/number_notation.cpp",
-      "source/i18n/number_output.cpp",
-      "source/i18n/number_padding.cpp",
-      "source/i18n/number_patternmodifier.cpp",
-      "source/i18n/number_patternmodifier.h",
-      "source/i18n/number_patternstring.cpp",
-      "source/i18n/number_patternstring.h",
-      "source/i18n/number_rounding.cpp",
-      "source/i18n/number_roundingutils.h",
-      "source/i18n/number_scientific.cpp",
-      "source/i18n/number_scientific.h",
-      "source/i18n/number_skeletons.cpp",
-      "source/i18n/number_skeletons.h",
-      "source/i18n/number_types.h",
-      "source/i18n/number_utils.cpp",
-      "source/i18n/number_utils.h",
-      "source/i18n/number_utypes.h",
-      "source/i18n/numfmt.cpp",
-      "source/i18n/numparse_affixes.cpp",
-      "source/i18n/numparse_affixes.h",
-      "source/i18n/numparse_compositions.cpp",
-      "source/i18n/numparse_compositions.h",
-      "source/i18n/numparse_currency.cpp",
-      "source/i18n/numparse_currency.h",
-      "source/i18n/numparse_decimal.cpp",
-      "source/i18n/numparse_decimal.h",
-      "source/i18n/numparse_impl.cpp",
-      "source/i18n/numparse_impl.h",
-      "source/i18n/numparse_parsednumber.cpp",
-      "source/i18n/numparse_scientific.cpp",
-      "source/i18n/numparse_scientific.h",
-      "source/i18n/numparse_symbols.cpp",
-      "source/i18n/numparse_symbols.h",
-      "source/i18n/numparse_types.h",
-      "source/i18n/numparse_utils.h",
-      "source/i18n/numparse_validators.cpp",
-      "source/i18n/numparse_validators.h",
-      "source/i18n/numrange_fluent.cpp",
-      "source/i18n/numrange_impl.cpp",
-      "source/i18n/numrange_impl.h",
-      "source/i18n/numsys.cpp",
-      "source/i18n/numsys_impl.h",
-      "source/i18n/olsontz.cpp",
-      "source/i18n/olsontz.h",
-      "source/i18n/persncal.cpp",
-      "source/i18n/persncal.h",
-      "source/i18n/plurfmt.cpp",
-      "source/i18n/plurrule.cpp",
-      "source/i18n/plurrule_impl.h",
-      "source/i18n/quant.cpp",
-      "source/i18n/quant.h",
-      "source/i18n/quantityformatter.cpp",
-      "source/i18n/quantityformatter.h",
-      "source/i18n/rbnf.cpp",
-      "source/i18n/rbt.cpp",
-      "source/i18n/rbt_data.cpp",
-      "source/i18n/rbt_data.h",
-      "source/i18n/rbt.h",
-      "source/i18n/rbt_pars.cpp",
-      "source/i18n/rbt_pars.h",
-      "source/i18n/rbt_rule.cpp",
-      "source/i18n/rbt_rule.h",
-      "source/i18n/rbt_set.cpp",
-      "source/i18n/rbt_set.h",
-      "source/i18n/rbtz.cpp",
-      "source/i18n/regexcmp.cpp",
-      "source/i18n/regexcmp.h",
-      "source/i18n/regexcst.h",
-      "source/i18n/regeximp.cpp",
-      "source/i18n/regeximp.h",
-      "source/i18n/regexst.cpp",
-      "source/i18n/regexst.h",
-      "source/i18n/regextxt.cpp",
-      "source/i18n/regextxt.h",
-      "source/i18n/region.cpp",
-      "source/i18n/region_impl.h",
-      "source/i18n/reldatefmt.cpp",
-      "source/i18n/reldtfmt.cpp",
-      "source/i18n/reldtfmt.h",
-      "source/i18n/rematch.cpp",
-      "source/i18n/remtrans.cpp",
-      "source/i18n/remtrans.h",
-      "source/i18n/repattrn.cpp",
-      "source/i18n/rulebasedcollator.cpp",
-      "source/i18n/scientificnumberformatter.cpp",
-      "source/i18n/scriptset.cpp",
-      "source/i18n/scriptset.h",
-      "source/i18n/search.cpp",
-      "source/i18n/selfmt.cpp",
-      "source/i18n/selfmtimpl.h",
-      "source/i18n/sharedbreakiterator.cpp",
-      "source/i18n/sharedbreakiterator.h",
-      "source/i18n/sharedcalendar.h",
-      "source/i18n/shareddateformatsymbols.h",
-      "source/i18n/sharednumberformat.h",
-      "source/i18n/sharedpluralrules.h",
-      "source/i18n/simpletz.cpp",
-      "source/i18n/smpdtfmt.cpp",
-      "source/i18n/smpdtfst.cpp",
-      "source/i18n/smpdtfst.h",
-      "source/i18n/sortkey.cpp",
-      "source/i18n/standardplural.cpp",
-      "source/i18n/standardplural.h",
-      "source/i18n/string_segment.cpp",
-      "source/i18n/string_segment.h",
-      "source/i18n/strmatch.cpp",
-      "source/i18n/strmatch.h",
-      "source/i18n/strrepl.cpp",
-      "source/i18n/strrepl.h",
-      "source/i18n/stsearch.cpp",
-      "source/i18n/taiwncal.cpp",
-      "source/i18n/taiwncal.h",
-      "source/i18n/timezone.cpp",
-      "source/i18n/titletrn.cpp",
-      "source/i18n/titletrn.h",
-      "source/i18n/tmunit.cpp",
-      "source/i18n/tmutamt.cpp",
-      "source/i18n/tmutfmt.cpp",
-      "source/i18n/tolowtrn.cpp",
-      "source/i18n/tolowtrn.h",
-      "source/i18n/toupptrn.cpp",
-      "source/i18n/toupptrn.h",
-      "source/i18n/translit.cpp",
-      "source/i18n/transreg.cpp",
-      "source/i18n/transreg.h",
-      "source/i18n/tridpars.cpp",
-      "source/i18n/tridpars.h",
-      "source/i18n/tzfmt.cpp",
-      "source/i18n/tzgnames.cpp",
-      "source/i18n/tzgnames.h",
-      "source/i18n/tznames.cpp",
-      "source/i18n/tznames_impl.cpp",
-      "source/i18n/tznames_impl.h",
-      "source/i18n/tzrule.cpp",
-      "source/i18n/tztrans.cpp",
-      "source/i18n/ucal.cpp",
-      "source/i18n/ucln_in.cpp",
-      "source/i18n/ucln_in.h",
-      "source/i18n/ucol.cpp",
-      "source/i18n/ucoleitr.cpp",
-      "source/i18n/ucol_imp.h",
-      "source/i18n/ucol_res.cpp",
-      "source/i18n/ucol_sit.cpp",
-      "source/i18n/ucsdet.cpp",
-      "source/i18n/udat.cpp",
-      "source/i18n/udateintervalformat.cpp",
-      "source/i18n/udatpg.cpp",
-      "source/i18n/ufieldpositer.cpp",
-      "source/i18n/uitercollationiterator.cpp",
-      "source/i18n/uitercollationiterator.h",
-      "source/i18n/ulistformatter.cpp",
-      "source/i18n/ulocdata.cpp",
-      "source/i18n/umsg.cpp",
-      "source/i18n/umsg_imp.h",
-      "source/i18n/unesctrn.cpp",
-      "source/i18n/unesctrn.h",
-      "source/i18n/uni2name.cpp",
-      "source/i18n/uni2name.h",
-      "source/i18n/unum.cpp",
-      "source/i18n/unumsys.cpp",
-      "source/i18n/upluralrules.cpp",
-      "source/i18n/uregexc.cpp",
-      "source/i18n/uregex.cpp",
-      "source/i18n/uregion.cpp",
-      "source/i18n/usearch.cpp",
-      "source/i18n/uspoof_build.cpp",
-      "source/i18n/uspoof_conf.cpp",
-      "source/i18n/uspoof_conf.h",
-      "source/i18n/uspoof.cpp",
-      "source/i18n/uspoof_impl.cpp",
-      "source/i18n/uspoof_impl.h",
-      "source/i18n/usrchimp.h",
-      "source/i18n/utf16collationiterator.cpp",
-      "source/i18n/utf16collationiterator.h",
-      "source/i18n/utf8collationiterator.cpp",
-      "source/i18n/utf8collationiterator.h",
-      "source/i18n/utmscale.cpp",
-      "source/i18n/utrans.cpp",
-      "source/i18n/vtzone.cpp",
-      "source/i18n/vzone.cpp",
-      "source/i18n/vzone.h",
-      "source/i18n/windtfmt.cpp",
-      "source/i18n/windtfmt.h",
-      "source/i18n/winnmfmt.cpp",
-      "source/i18n/winnmfmt.h",
-      "source/i18n/wintzimpl.cpp",
-      "source/i18n/wintzimpl.h",
-      "source/i18n/zonemeta.cpp",
-      "source/i18n/zonemeta.h",
-      "source/i18n/zrule.cpp",
-      "source/i18n/zrule.h",
-      "source/i18n/ztrans.cpp",
-      "source/i18n/ztrans.h",
-      # I18N_SRC_END
-    ]
-    # ls source/i18n/unicode/*h | sort | sed 's/^\(.*\)$/    "\1",/'
-    public = [
-      # crbug.com/726654: Make astro.h public until the upstream adds an API.
-      "source/i18n/astro.h",
-      # I18N_HDR_START
-      "source/i18n/unicode/alphaindex.h",
-      "source/i18n/unicode/basictz.h",
-      "source/i18n/unicode/calendar.h",
-      "source/i18n/unicode/choicfmt.h",
-      "source/i18n/unicode/coleitr.h",
-      "source/i18n/unicode/coll.h",
-      "source/i18n/unicode/compactdecimalformat.h",
-      "source/i18n/unicode/curramt.h",
-      "source/i18n/unicode/currpinf.h",
-      "source/i18n/unicode/currunit.h",
-      "source/i18n/unicode/datefmt.h",
-      "source/i18n/unicode/dcfmtsym.h",
-      "source/i18n/unicode/decimfmt.h",
-      "source/i18n/unicode/dtfmtsym.h",
-      "source/i18n/unicode/dtitvfmt.h",
-      "source/i18n/unicode/dtitvinf.h",
-      "source/i18n/unicode/dtptngen.h",
-      "source/i18n/unicode/dtrule.h",
-      "source/i18n/unicode/fieldpos.h",
-      "source/i18n/unicode/fmtable.h",
-      "source/i18n/unicode/format.h",
-      "source/i18n/unicode/formattedvalue.h",
-      "source/i18n/unicode/fpositer.h",
-      "source/i18n/unicode/gender.h",
-      "source/i18n/unicode/gregocal.h",
-      "source/i18n/unicode/listformatter.h",
-      "source/i18n/unicode/measfmt.h",
-      "source/i18n/unicode/measunit.h",
-      "source/i18n/unicode/measure.h",
-      "source/i18n/unicode/msgfmt.h",
-      "source/i18n/unicode/nounit.h",
-      "source/i18n/unicode/numberformatter.h",
-      "source/i18n/unicode/numberrangeformatter.h",
-      "source/i18n/unicode/numfmt.h",
-      "source/i18n/unicode/numsys.h",
-      "source/i18n/unicode/plurfmt.h",
-      "source/i18n/unicode/plurrule.h",
-      "source/i18n/unicode/rbnf.h",
-      "source/i18n/unicode/rbtz.h",
-      "source/i18n/unicode/regex.h",
-      "source/i18n/unicode/region.h",
-      "source/i18n/unicode/reldatefmt.h",
-      "source/i18n/unicode/scientificnumberformatter.h",
-      "source/i18n/unicode/search.h",
-      "source/i18n/unicode/selfmt.h",
-      "source/i18n/unicode/simpletz.h",
-      "source/i18n/unicode/smpdtfmt.h",
-      "source/i18n/unicode/sortkey.h",
-      "source/i18n/unicode/stsearch.h",
-      "source/i18n/unicode/tblcoll.h",
-      "source/i18n/unicode/timezone.h",
-      "source/i18n/unicode/tmunit.h",
-      "source/i18n/unicode/tmutamt.h",
-      "source/i18n/unicode/tmutfmt.h",
-      "source/i18n/unicode/translit.h",
-      "source/i18n/unicode/tzfmt.h",
-      "source/i18n/unicode/tznames.h",
-      "source/i18n/unicode/tzrule.h",
-      "source/i18n/unicode/tztrans.h",
-      "source/i18n/unicode/ucal.h",
-      "source/i18n/unicode/ucoleitr.h",
-      "source/i18n/unicode/ucol.h",
-      "source/i18n/unicode/ucsdet.h",
-      "source/i18n/unicode/udateintervalformat.h",
-      "source/i18n/unicode/udat.h",
-      "source/i18n/unicode/udatpg.h",
-      "source/i18n/unicode/ufieldpositer.h",
-      "source/i18n/unicode/uformattable.h",
-      "source/i18n/unicode/uformattedvalue.h",
-      "source/i18n/unicode/ugender.h",
-      "source/i18n/unicode/ulistformatter.h",
-      "source/i18n/unicode/ulocdata.h",
-      "source/i18n/unicode/umsg.h",
-      "source/i18n/unicode/unirepl.h",
-      "source/i18n/unicode/unumberformatter.h",
-      "source/i18n/unicode/unum.h",
-      "source/i18n/unicode/unumsys.h",
-      "source/i18n/unicode/upluralrules.h",
-      "source/i18n/unicode/uregex.h",
-      "source/i18n/unicode/uregion.h",
-      "source/i18n/unicode/ureldatefmt.h",
-      "source/i18n/unicode/usearch.h",
-      "source/i18n/unicode/uspoof.h",
-      "source/i18n/unicode/utmscale.h",
-      "source/i18n/unicode/utrans.h",
-      "source/i18n/unicode/vtzone.h",
-      # I18N_HDR_END
-    ]
+template("generate_icu_component") {
+  if (icu_is_in_fuchsia) {
+    target(default_library_type, target_name) {
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "testonly",
+                               "visibility",
+                             ])
+      assert(fuchsia_output_name_postfix == "")
 
-    defines = [ "U_I18N_IMPLEMENTATION" ]
-    deps = icuuc_deps
-
-    # ICU uses RTTI, replace the default "no rtti" config.
-    # <fuchsia-icu>
-    if (icu_is_in_fuchsia) {
+      # ICU uses RTTI, replace the default "no rtti" config.
       configs -= [
         "//build/config:no_rtti",
         "//build/config:symbol_visibility_hidden",
       ]
+
       configs += [ "//build/config:rtti" ]
-    } else {
+
+      # These need to be applied after the main configs so the "-Wno-*" options
+      # take effect.
+      configs += [ ":icu_code" ]
+      configs += extra_configs
+      public_configs = [ ":icu_config" ]
+    }
+  } else {
+    component(target_name) {
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "testonly",
+                               "visibility",
+                             ])
+      if (is_fuchsia) {
+        # Fuchsia puts its own libicu*.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 = "${target_name}_cr${fuchsia_output_name_postfix}"
+      } else {
+        assert(fuchsia_output_name_postfix == "")
+      }
+
+      # ICU uses RTTI, replace the default "no rtti" config.
       configs -= [
-        "//build/config/compiler:no_rtti",  # ICU uses RTTI.
+        "//build/config/compiler:no_rtti",
         "//build/config/compiler:chromium_code",
       ]
       configs += [
         "//build/config/compiler:rtti",
         "//build/config/compiler:no_chromium_code",
       ]
-    }
-    # </fuchsia-icu>
 
-    configs += [ ":icu_code" ]
-    configs += extra_configs
-    public_configs = [ ":icu_config" ]
-
-    # <fuchsia-icu>
-    if (is_fuchsia && !icu_is_in_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_output_name_postfix}"
-    } else {
-      assert(fuchsia_output_name_postfix == "")
+      # These need to be applied after the main configs so the "-Wno-*" options
+      # take effect.
+      configs += [ ":icu_code" ]
+      configs += extra_configs
+      public_configs = [ ":icu_config" ]
     }
-    # </fuchsia-icu>
+  }
+}
+
+template("generate_icui18n") {
+  generate_icu_component(target_name) {
+    assert(defined(invoker.icuuc_deps), "Need the 'icuuc_deps' parameter.")
+    icuuc_deps = invoker.icuuc_deps
+
+    fuchsia_output_name_postfix = ""
+    if (defined(invoker.fuchsia_output_name_postfix)) {
+      fuchsia_output_name_postfix = invoker.fuchsia_output_name_postfix
+    }
+
+    forward_variables_from(invoker,
+                           "*",
+                           [
+                             "testonly",
+                             "visibility",
+                           ])
+
+    sources = icu18n_sources
+    public = icu18n_public
+
+    defines = [ "U_I18N_IMPLEMENTATION" ]
+    deps = icuuc_deps
 
     # Make icu into a standalone static library. Currently This is only useful on
     # Chrome OS.
@@ -705,509 +232,54 @@
 }
 
 generate_icui18n("icui18n") {
-  extra_configs = [ ]
-  icuuc_deps  = [ ":icuuc" ]
+  extra_configs = []
+  icuuc_deps = [ ":icuuc" ]
 }
 
 generate_icui18n("icui18n_hidden_visibility") {
   extra_configs = [ ":visibility_hidden" ]
   icuuc_deps = [ ":icuuc_hidden_visibility" ]
-  # <fuchsia-icu>
   if (is_fuchsia && !icu_is_in_fuchsia) {
     fuchsia_output_name_postfix = "_hidden_visibility"
   }
-  # </fuchsia-icu>
 }
 
 template("generate_icuuc") {
-  extra_configs = []
-  if (defined(invoker.extra_configs)) {
-    extra_configs += invoker.extra_configs
-  }
-  fuchsia_output_name_postfix = ""
-  if (defined(invoker.fuchsia_output_name_postfix)) {
-    fuchsia_output_name_postfix = invoker.fuchsia_output_name_postfix
-  }
-  # <fuchsia-icu>
-  target(default_library_type, target_name) {
-  # </fuchsia-icu>
-    # find  source/common -maxdepth 1  ! -type d  | egrep  '\.(c|cpp|h)$' |\
-    # sort | sed 's/^\(.*\)$/    "\1",/'
-    sources = [
-      # COMMON_SRC_START
-      "source/common/appendable.cpp",
-      "source/common/bmpset.cpp",
-      "source/common/bmpset.h",
-      "source/common/brkeng.cpp",
-      "source/common/brkeng.h",
-      "source/common/brkiter.cpp",
-      "source/common/bytesinkutil.cpp",
-      "source/common/bytesinkutil.h",
-      "source/common/bytestream.cpp",
-      "source/common/bytestriebuilder.cpp",
-      "source/common/bytestrie.cpp",
-      "source/common/bytestrieiterator.cpp",
-      "source/common/caniter.cpp",
-      "source/common/capi_helper.h",
-      "source/common/characterproperties.cpp",
-      "source/common/chariter.cpp",
-      "source/common/charstr.cpp",
-      "source/common/charstr.h",
-      "source/common/cmemory.cpp",
-      "source/common/cmemory.h",
-      "source/common/cpputils.h",
-      "source/common/cstr.cpp",
-      "source/common/cstr.h",
-      "source/common/cstring.cpp",
-      "source/common/cstring.h",
-      "source/common/cwchar.cpp",
-      "source/common/cwchar.h",
-      "source/common/dictbe.cpp",
-      "source/common/dictbe.h",
-      "source/common/dictionarydata.cpp",
-      "source/common/dictionarydata.h",
-      "source/common/dtintrv.cpp",
-      "source/common/edits.cpp",
-      "source/common/errorcode.cpp",
-      "source/common/filteredbrk.cpp",
-      "source/common/filterednormalizer2.cpp",
-      "source/common/hash.h",
-      "source/common/icudataver.cpp",
-      "source/common/icuplug.cpp",
-      "source/common/icuplugimp.h",
-      "source/common/loadednormalizer2impl.cpp",
-      "source/common/localebuilder.cpp",
-      "source/common/localematcher.cpp",
-      "source/common/localeprioritylist.cpp",
-      "source/common/localeprioritylist.h",
-      "source/common/localsvc.h",
-      "source/common/locavailable.cpp",
-      "source/common/locbased.cpp",
-      "source/common/locbased.h",
-      "source/common/locdispnames.cpp",
-      "source/common/locdistance.cpp",
-      "source/common/locdistance.h",
-      "source/common/locdspnm.cpp",
-      "source/common/locid.cpp",
-      "source/common/loclikely.cpp",
-      "source/common/loclikelysubtags.cpp",
-      "source/common/loclikelysubtags.h",
-      "source/common/locmap.cpp",
-      "source/common/locmap.h",
-      "source/common/locresdata.cpp",
-      "source/common/locutil.cpp",
-      "source/common/locutil.h",
-      "source/common/lsr.cpp",
-      "source/common/lsr.h",
-      "source/common/messageimpl.h",
-      "source/common/messagepattern.cpp",
-      "source/common/msvcres.h",
-      "source/common/mutex.h",
-      "source/common/norm2allmodes.h",
-      "source/common/norm2_nfc_data.h",
-      "source/common/normalizer2.cpp",
-      "source/common/normalizer2impl.cpp",
-      "source/common/normalizer2impl.h",
-      "source/common/normlzr.cpp",
-      "source/common/parsepos.cpp",
-      "source/common/patternprops.cpp",
-      "source/common/patternprops.h",
-      "source/common/pluralmap.cpp",
-      "source/common/pluralmap.h",
-      "source/common/propname.cpp",
-      "source/common/propname_data.h",
-      "source/common/propname.h",
-      "source/common/propsvec.cpp",
-      "source/common/propsvec.h",
-      "source/common/punycode.cpp",
-      "source/common/punycode.h",
-      "source/common/putil.cpp",
-      "source/common/putilimp.h",
-      "source/common/rbbi_cache.cpp",
-      "source/common/rbbi_cache.h",
-      "source/common/rbbi.cpp",
-      "source/common/rbbidata.cpp",
-      "source/common/rbbidata.h",
-      "source/common/rbbinode.cpp",
-      "source/common/rbbinode.h",
-      "source/common/rbbirb.cpp",
-      "source/common/rbbirb.h",
-      "source/common/rbbirpt.h",
-      "source/common/rbbiscan.cpp",
-      "source/common/rbbiscan.h",
-      "source/common/rbbisetb.cpp",
-      "source/common/rbbisetb.h",
-      "source/common/rbbistbl.cpp",
-      "source/common/rbbitblb.cpp",
-      "source/common/rbbitblb.h",
-      "source/common/resbund_cnv.cpp",
-      "source/common/resbund.cpp",
-      "source/common/resource.cpp",
-      "source/common/resource.h",
-      "source/common/restrace.cpp",
-      "source/common/restrace.h",
-      "source/common/ruleiter.cpp",
-      "source/common/ruleiter.h",
-      "source/common/schriter.cpp",
-      "source/common/serv.cpp",
-      "source/common/serv.h",
-      "source/common/servlk.cpp",
-      "source/common/servlkf.cpp",
-      "source/common/servloc.h",
-      "source/common/servls.cpp",
-      "source/common/servnotf.cpp",
-      "source/common/servnotf.h",
-      "source/common/servrbf.cpp",
-      "source/common/servslkf.cpp",
-      "source/common/sharedobject.cpp",
-      "source/common/sharedobject.h",
-      "source/common/simpleformatter.cpp",
-      "source/common/sprpimpl.h",
-      "source/common/static_unicode_sets.cpp",
-      "source/common/static_unicode_sets.h",
-      "source/common/stringpiece.cpp",
-      "source/common/stringtriebuilder.cpp",
-      "source/common/uarrsort.cpp",
-      "source/common/uarrsort.h",
-      "source/common/uassert.h",
-      "source/common/ubidi.cpp",
-      "source/common/ubidiimp.h",
-      "source/common/ubidiln.cpp",
-      "source/common/ubidi_props.cpp",
-      "source/common/ubidi_props_data.h",
-      "source/common/ubidi_props.h",
-      "source/common/ubiditransform.cpp",
-      "source/common/ubidiwrt.cpp",
-      "source/common/ubrk.cpp",
-      "source/common/ubrkimpl.h",
-      "source/common/ucase.cpp",
-      "source/common/ucase.h",
-      "source/common/ucasemap.cpp",
-      "source/common/ucasemap_imp.h",
-      "source/common/ucasemap_titlecase_brkiter.cpp",
-      "source/common/ucase_props_data.h",
-      "source/common/ucat.cpp",
-      "source/common/uchar.cpp",
-      "source/common/uchar_props_data.h",
-      "source/common/ucharstriebuilder.cpp",
-      "source/common/ucharstrie.cpp",
-      "source/common/ucharstrieiterator.cpp",
-      "source/common/uchriter.cpp",
-      "source/common/ucln_cmn.cpp",
-      "source/common/ucln_cmn.h",
-      "source/common/ucln.h",
-      "source/common/ucln_imp.h",
-      "source/common/ucmndata.cpp",
-      "source/common/ucmndata.h",
-      "source/common/ucnv2022.cpp",
-      "source/common/ucnv_bld.cpp",
-      "source/common/ucnv_bld.h",
-      "source/common/ucnvbocu.cpp",
-      "source/common/ucnv_cb.cpp",
-      "source/common/ucnv_cnv.cpp",
-      "source/common/ucnv_cnv.h",
-      "source/common/ucnv.cpp",
-      "source/common/ucnv_ct.cpp",
-      "source/common/ucnvdisp.cpp",
-      "source/common/ucnv_err.cpp",
-      "source/common/ucnv_ext.cpp",
-      "source/common/ucnv_ext.h",
-      "source/common/ucnvhz.cpp",
-      "source/common/ucnv_imp.h",
-      "source/common/ucnv_io.cpp",
-      "source/common/ucnv_io.h",
-      "source/common/ucnvisci.cpp",
-      "source/common/ucnvlat1.cpp",
-      "source/common/ucnv_lmb.cpp",
-      "source/common/ucnvmbcs.cpp",
-      "source/common/ucnvmbcs.h",
-      "source/common/ucnvscsu.cpp",
-      "source/common/ucnvsel.cpp",
-      "source/common/ucnv_set.cpp",
-      "source/common/ucnv_u16.cpp",
-      "source/common/ucnv_u32.cpp",
-      "source/common/ucnv_u7.cpp",
-      "source/common/ucnv_u8.cpp",
-      "source/common/ucol_data.h",
-      "source/common/ucol_swp.cpp",
-      "source/common/ucol_swp.h",
-      "source/common/ucptrie.cpp",
-      "source/common/ucptrie_impl.h",
-      "source/common/ucurr.cpp",
-      "source/common/ucurrimp.h",
-      "source/common/udata.cpp",
-      "source/common/udatamem.cpp",
-      "source/common/udatamem.h",
-      "source/common/udataswp.cpp",
-      "source/common/udataswp.h",
-      "source/common/uelement.h",
-      "source/common/uenum.cpp",
-      "source/common/uenumimp.h",
-      "source/common/uhash.cpp",
-      "source/common/uhash.h",
-      "source/common/uhash_us.cpp",
-      "source/common/uidna.cpp",
-      "source/common/uinit.cpp",
-      "source/common/uinvchar.cpp",
-      "source/common/uinvchar.h",
-      "source/common/uiter.cpp",
-      "source/common/ulayout_props.h",
-      "source/common/ulist.cpp",
-      "source/common/ulist.h",
-      "source/common/uloc.cpp",
-      "source/common/ulocimp.h",
-      "source/common/uloc_keytype.cpp",
-      "source/common/uloc_tag.cpp",
-      "source/common/umapfile.cpp",
-      "source/common/umapfile.h",
-      "source/common/umath.cpp",
-      "source/common/umutablecptrie.cpp",
-      "source/common/umutex.cpp",
-      "source/common/umutex.h",
-      "source/common/unames.cpp",
-      "source/common/unifiedcache.cpp",
-      "source/common/unifiedcache.h",
-      "source/common/unifilt.cpp",
-      "source/common/unifunct.cpp",
-      "source/common/uniset_closure.cpp",
-      "source/common/uniset.cpp",
-      "source/common/uniset_props.cpp",
-      "source/common/unisetspan.cpp",
-      "source/common/unisetspan.h",
-      "source/common/unistrappender.h",
-      "source/common/unistr_case.cpp",
-      "source/common/unistr_case_locale.cpp",
-      "source/common/unistr_cnv.cpp",
-      "source/common/unistr.cpp",
-      "source/common/unistr_props.cpp",
-      "source/common/unistr_titlecase_brkiter.cpp",
-      "source/common/unormcmp.cpp",
-      "source/common/unorm.cpp",
-      "source/common/unormimp.h",
-      "source/common/uobject.cpp",
-      "source/common/uposixdefs.h",
-      "source/common/uprops.cpp",
-      "source/common/uprops.h",
-      "source/common/uresbund.cpp",
-      "source/common/ures_cnv.cpp",
-      "source/common/uresdata.cpp",
-      "source/common/uresdata.h",
-      "source/common/uresimp.h",
-      "source/common/ureslocs.h",
-      "source/common/usc_impl.cpp",
-      "source/common/usc_impl.h",
-      "source/common/uscript.cpp",
-      "source/common/uscript_props.cpp",
-      "source/common/uset.cpp",
-      "source/common/uset_imp.h",
-      "source/common/usetiter.cpp",
-      "source/common/uset_props.cpp",
-      "source/common/ushape.cpp",
-      "source/common/usprep.cpp",
-      "source/common/ustack.cpp",
-      "source/common/ustrcase.cpp",
-      "source/common/ustrcase_locale.cpp",
-      "source/common/ustr_cnv.cpp",
-      "source/common/ustr_cnv.h",
-      "source/common/ustrenum.cpp",
-      "source/common/ustrenum.h",
-      "source/common/ustrfmt.cpp",
-      "source/common/ustrfmt.h",
-      "source/common/ustr_imp.h",
-      "source/common/ustring.cpp",
-      "source/common/ustr_titlecase_brkiter.cpp",
-      "source/common/ustrtrns.cpp",
-      "source/common/ustr_wcs.cpp",
-      "source/common/utext.cpp",
-      "source/common/utf_impl.cpp",
-      "source/common/util.cpp",
-      "source/common/util.h",
-      "source/common/util_props.cpp",
-      "source/common/utrace.cpp",
-      "source/common/utracimp.h",
-      "source/common/utrie2_builder.cpp",
-      "source/common/utrie2.cpp",
-      "source/common/utrie2.h",
-      "source/common/utrie2_impl.h",
-      "source/common/utrie.cpp",
-      "source/common/utrie.h",
-      "source/common/utrie_swap.cpp",
-      "source/common/uts46.cpp",
-      "source/common/utypeinfo.h",
-      "source/common/utypes.cpp",
-      "source/common/uvector.cpp",
-      "source/common/uvector.h",
-      "source/common/uvectr32.cpp",
-      "source/common/uvectr32.h",
-      "source/common/uvectr64.cpp",
-      "source/common/uvectr64.h",
-      "source/common/wintz.cpp",
-      "source/common/wintz.h",
-      # COMMON_SRC_END
-    ]
-
-    # ls  source/common/unicode/*h | sort | sed 's/^\(.*\)$/    "\1",/'
-    public = [
-      # COMMON_HDR_START
-      "source/common/unicode/appendable.h",
-      "source/common/unicode/brkiter.h",
-      "source/common/unicode/bytestream.h",
-      "source/common/unicode/bytestriebuilder.h",
-      "source/common/unicode/bytestrie.h",
-      "source/common/unicode/caniter.h",
-      "source/common/unicode/casemap.h",
-      "source/common/unicode/char16ptr.h",
-      "source/common/unicode/chariter.h",
-      "source/common/unicode/dbbi.h",
-      "source/common/unicode/docmain.h",
-      "source/common/unicode/dtintrv.h",
-      "source/common/unicode/edits.h",
-      "source/common/unicode/enumset.h",
-      "source/common/unicode/errorcode.h",
-      "source/common/unicode/filteredbrk.h",
-      "source/common/unicode/icudataver.h",
-      "source/common/unicode/icuplug.h",
-      "source/common/unicode/idna.h",
-      "source/common/unicode/localebuilder.h",
-      "source/common/unicode/localematcher.h",
-      "source/common/unicode/localpointer.h",
-      "source/common/unicode/locdspnm.h",
-      "source/common/unicode/locid.h",
-      "source/common/unicode/messagepattern.h",
-      "source/common/unicode/normalizer2.h",
-      "source/common/unicode/normlzr.h",
-      "source/common/unicode/parseerr.h",
-      "source/common/unicode/parsepos.h",
-      "source/common/unicode/platform.h",
-      "source/common/unicode/ptypes.h",
-      "source/common/unicode/putil.h",
-      "source/common/unicode/rbbi.h",
-      "source/common/unicode/rep.h",
-      "source/common/unicode/resbund.h",
-      "source/common/unicode/schriter.h",
-      "source/common/unicode/simpleformatter.h",
-      "source/common/unicode/std_string.h",
-      "source/common/unicode/strenum.h",
-      "source/common/unicode/stringoptions.h",
-      "source/common/unicode/stringpiece.h",
-      "source/common/unicode/stringtriebuilder.h",
-      "source/common/unicode/symtable.h",
-      "source/common/unicode/ubidi.h",
-      "source/common/unicode/ubiditransform.h",
-      "source/common/unicode/ubrk.h",
-      "source/common/unicode/ucasemap.h",
-      "source/common/unicode/ucat.h",
-      "source/common/unicode/uchar.h",
-      "source/common/unicode/ucharstriebuilder.h",
-      "source/common/unicode/ucharstrie.h",
-      "source/common/unicode/uchriter.h",
-      "source/common/unicode/uclean.h",
-      "source/common/unicode/ucnv_cb.h",
-      "source/common/unicode/ucnv_err.h",
-      "source/common/unicode/ucnv.h",
-      "source/common/unicode/ucnvsel.h",
-      "source/common/unicode/uconfig.h",
-      "source/common/unicode/ucpmap.h",
-      "source/common/unicode/ucptrie.h",
-      "source/common/unicode/ucurr.h",
-      "source/common/unicode/udata.h",
-      "source/common/unicode/udisplaycontext.h",
-      "source/common/unicode/uenum.h",
-      "source/common/unicode/uidna.h",
-      "source/common/unicode/uiter.h",
-      "source/common/unicode/uldnames.h",
-      "source/common/unicode/uloc.h",
-      "source/common/unicode/umachine.h",
-      "source/common/unicode/umisc.h",
-      "source/common/unicode/umutablecptrie.h",
-      "source/common/unicode/unifilt.h",
-      "source/common/unicode/unifunct.h",
-      "source/common/unicode/unimatch.h",
-      "source/common/unicode/uniset.h",
-      "source/common/unicode/unistr.h",
-      "source/common/unicode/unorm2.h",
-      "source/common/unicode/unorm.h",
-      "source/common/unicode/uobject.h",
-      "source/common/unicode/urename.h",
-      "source/common/unicode/urep.h",
-      "source/common/unicode/ures.h",
-      "source/common/unicode/uscript.h",
-      "source/common/unicode/uset.h",
-      "source/common/unicode/usetiter.h",
-      "source/common/unicode/ushape.h",
-      "source/common/unicode/usprep.h",
-      "source/common/unicode/ustring.h",
-      "source/common/unicode/ustringtrie.h",
-      "source/common/unicode/utext.h",
-      "source/common/unicode/utf16.h",
-      "source/common/unicode/utf32.h",
-      "source/common/unicode/utf8.h",
-      "source/common/unicode/utf.h",
-      "source/common/unicode/utf_old.h",
-      "source/common/unicode/utrace.h",
-      "source/common/unicode/utypes.h",
-      "source/common/unicode/uvernum.h",
-      "source/common/unicode/uversion.h",
-      # COMMON_HDR_END
-    ]
-    defines = [ "U_COMMON_IMPLEMENTATION" ]
-    deps = [
-      ":icudata",
-    ]
-
-    # ICU uses RTTI, replace the default "no rtti" config.
-    # <fuchsia-icu>
-    if (icu_is_in_fuchsia) {
-      configs -= [
-        "//build/config:no_rtti",
-        "//build/config:symbol_visibility_hidden",
-      ]
-      configs += [ "//build/config:rtti" ]
-    } else {
-      configs -= [
-        "//build/config/compiler:no_rtti",  # ICU uses RTTI.
-        "//build/config/compiler:chromium_code",
-      ]
-      configs += [
-        "//build/config/compiler:rtti",
-        "//build/config/compiler:no_chromium_code",
-      ]
+  generate_icu_component(target_name) {
+    fuchsia_output_name_postfix = ""
+    if (defined(invoker.fuchsia_output_name_postfix)) {
+      fuchsia_output_name_postfix = invoker.fuchsia_output_name_postfix
     }
-    # </fuchsia-icu>
 
-    configs += [ ":icu_code" ]
-    configs += extra_configs
+    forward_variables_from(invoker,
+                           "*",
+                           [
+                             "testonly",
+                             "visibility",
+                           ])
 
-    public_configs = [ ":icu_config" ]
+    sources = icuuc_sources
+    public = icuuc_public
+
+    defines = [ "U_COMMON_IMPLEMENTATION" ]
+    deps = [ ":icudata" ]
 
     if (icu_use_data_file) {
       sources += [ "source/stubdata/stubdata.cpp" ]
     }
 
     defines += [ "U_ICUDATAENTRY_IN_COMMON" ]
-
-    # <fuchsia-icu>
-    if (is_fuchsia && !icu_is_in_fuchsia) {
-      # Fuchsia puts its own libicuuc.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_output_name_postfix}"
-    } else {
-      assert(fuchsia_output_name_postfix == "")
-    }
-    # </fuchsia-icu>
   }
 }
 
 generate_icuuc("icuuc") {
-  extra_configs = [ ]
+  extra_configs = []
 }
 generate_icuuc("icuuc_hidden_visibility") {
   extra_configs = [ ":visibility_hidden" ]
-  # <fuchsia-icu>
   if (is_fuchsia && !icu_is_in_fuchsia) {
     fuchsia_output_name_postfix = "_hidden_visibility"
   }
-  # </fuchsia-icu>
 }
 
 if (is_android && enable_java_templates) {
@@ -1229,7 +301,7 @@
 }
 
 if (is_android) {
-# Use android_small for now to keep the size till we decide to switch to the new one.
+  # Use android_small for now to keep the size till we decide to switch to the new one.
   data_dir = "android_small"
 } else if (is_ios) {
   data_dir = "ios"
@@ -1288,11 +360,12 @@
       deps = [ ":make_data_assembly" ]
       script = "scripts/asm_to_inline_asm.py"
       inputs = [ data_assembly ]
-      outputs =  [ inline_data_assembly ]
+      outputs = [ inline_data_assembly ]
       args = rebase_path([
-        data_assembly,
-        inline_data_assembly,
-      ], root_build_dir)
+                           data_assembly,
+                           inline_data_assembly,
+                         ],
+                         root_build_dir)
     }
   } else {
     not_needed([ "inline_data_assembly" ])
@@ -1302,10 +375,10 @@
     defines = [ "U_HIDE_DATA_SYMBOL" ]
     if (is_win) {
       sources = [ inline_data_assembly ]
-      deps = [ ":make_inline_data_assembly", ]
+      deps = [ ":make_inline_data_assembly" ]
     } else {
       sources = [ data_assembly ]
-      deps = [ ":make_data_assembly", ]
+      deps = [ ":make_data_assembly" ]
     }
   }
 }
diff --git a/README.chromium b/README.chromium
index a45085f..4b68bec 100644
--- a/README.chromium
+++ b/README.chromium
@@ -15,13 +15,14 @@
    It does preserve Chrome-specific build files and
    converter files. (see section C)
 
-   BUILD.gn and icu.gyp* files are automatically updated, too.
+   source.gni and icu.gyp* files are automatically updated, too.
 
 2. Review and apply patches/changes in "D. Local Modifications" if
    necessary/applicable. Update patch files in patches/.
 
 3. Follow the instructions in section B on building ICU data files
 
+4. Update version.gni with the major version number for ICU.
 
 B. How to build ICU data files
 
@@ -81,7 +82,7 @@
      non-Android and Android platforms.
 
   c. Whenever data is updated (e.g timezone update), take step b as long
-  as the ICU build directory used in a is kept.
+     as the ICU build directory used in a. is kept.
 
 2. Note on the locale data customization
 
diff --git a/README.fuchsia b/README.fuchsia
index 3ca560b..e716b92 100644
--- a/README.fuchsia
+++ b/README.fuchsia
@@ -11,28 +11,30 @@
 ICU project.  See the section "LOCAL MODIFICATIONS" for the details of the
 local changes.
 
-Note that although Chromium and Chromium ICU's GN files have an `is_fuchsia`
-constant that is set to `true` for binaries that target Fuchsia OS, building
-_Chromium ICU_ with `is_fuchsia = true` is _not_ the same as building
-_Fuchsia ICU_. This is because of the other differences in build rules between
-the two.
+Most of the Fuchsia-specific changes have been upstreamed to Chromium. If
+possible, update the upstream Chromium repository directly and not the Fuchsia
+copy directly.
 
-(Fuchsia ICU can also be built with `is_fuchsia = false`, e.g. for Fuchsia host
-targets.)
+The differences between the Chromium and the Fuchsia builds are behind the
+`icu_is_in_fuchsia` gn argument.
 
 LOCAL MODIFICATIONS
 
-The local changes made specifically for Fuchsia with respect to the Chromium
-ICU original are fenced off like this in the respective files:
+The following patch has been applied to source/common/uposixdefs.h:
 
-    # <fuchsia-icu>
-    ... local additions ...
-    # </fuchsia-icu>
-
-- config.gni defines an |icu_is_in_fuchsia| gn variable. This is used in
-  BUILD.gn for changes from the Chromium ICU build.
-- version.gni contains a config variable which has the major version of the
-  ICU library.
+diff --git a/source/common/uposixdefs.h b/source/common/uposixdefs.h
+index 23c3f6d4..015064ab 100644
+--- a/source/common/uposixdefs.h
++++ b/source/common/uposixdefs.h
+@@ -33,7 +33,7 @@
+  */
+ #ifdef _XOPEN_SOURCE
+     /* Use the predefined value. */
+-#else
++#elif !defined(__APPLE__)
+     /*
+      * Version 6.0:
+      * The Open Group Base Specifications Issue 6 (IEEE Std 1003.1, 2004 Edition)
 
 UPDATE PROCEDURE
 
@@ -51,14 +53,5 @@
    From $FUCHSIA_DIR/third_party/icu on the origin/master branch, run:
    $ git merge chromium/master
 
-   Fix all the merge conflicts, paying special attention to not override
-   Fuchsia-specific changes. In particular, make sure the Mac host build does
-   not break as this configuration is not tested in CQ. If you do not have a
-   Mac, ask someone who does to test your changes before submitting.
-
-   Ensure that the version number in `//version.gni` matches the major version
-   of the ICU library that is being used.  The file `//README.chromium` usually
-   has the major version number listed in the `Description:` section.
-
    See an example here:
    https://fuchsia-review.googlesource.com/c/third_party/icu/+/403454
diff --git a/config.gni b/config.gni
index 7d20a17..5bb6e4e 100644
--- a/config.gni
+++ b/config.gni
@@ -6,6 +6,7 @@
   # Tells icu to load an external data file rather than rely on the icudata
   # being linked directly into the binary.
   icu_use_data_file = true
+
   # If true, compile icu into a standalone static library. Currently this is
   # only useful on Chrome OS.
   icu_disable_thin_archive = false
diff --git a/scripts/update.sh b/scripts/update.sh
index 61ab84c..205ed67 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -60,16 +60,16 @@
 
 cd "${treeroot}"
 
-echo "Updating BUILD.gn"
+echo "Updating sources.gni"
 
 find  source/i18n -maxdepth 1  ! -type d  | egrep  '\.(c|cpp|h)$' |sort | \
-  sed 's/^\(.*\)$/    "\1",/' > i18n_src.list
-ls source/i18n/unicode/*h | sort | sed 's/^\(.*\)$/    "\1",/' > i18n_hdr.list
+  sed 's/^\(.*\)$/  "\1",/' > i18n_src.list
+ls source/i18n/unicode/*h | sort | sed 's/^\(.*\)$/  "\1",/' > i18n_hdr.list
 
 find  source/common -maxdepth 1  ! -type d  | egrep  '\.(c|cpp|h)$' |sort | \
-  sed 's/^\(.*\)$/    "\1",/' > common_src.list
+  sed 's/^\(.*\)$/  "\1",/' > common_src.list
 ls source/common/unicode/*h | sort | \
-  sed 's/^\(.*\)$/    "\1",/' > common_hdr.list
+  sed 's/^\(.*\)$/  "\1",/' > common_hdr.list
 
 sed   -i \
   '/I18N_SRC_START/,/I18N_SRC_END/ {
@@ -87,7 +87,7 @@
    /COMMON_HDR_START/,/COMMON_HDR_END/ {
       /COMMON_HDR_START/ r common_hdr.list
       /source.common/ d
-   }' BUILD.gn
+   }' sources.gni
 
 echo "Updating icu.gyp* files"
 
diff --git a/sources.gni b/sources.gni
new file mode 100644
index 0000000..bd53af6
--- /dev/null
+++ b/sources.gni
@@ -0,0 +1,927 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# find  source/i18n -maxdepth 1  ! -type d  | egrep  '\.(c|cpp|h)$' |\
+# sort | sed 's/^\(.*\)$/  "\1",/'
+icu18n_sources = [
+  # I18N_SRC_START
+  "source/i18n/alphaindex.cpp",
+  "source/i18n/anytrans.cpp",
+  "source/i18n/anytrans.h",
+  "source/i18n/astro.cpp",
+  "source/i18n/astro.h",
+  "source/i18n/basictz.cpp",
+  "source/i18n/bocsu.cpp",
+  "source/i18n/bocsu.h",
+  "source/i18n/brktrans.cpp",
+  "source/i18n/brktrans.h",
+  "source/i18n/buddhcal.cpp",
+  "source/i18n/buddhcal.h",
+  "source/i18n/calendar.cpp",
+  "source/i18n/casetrn.cpp",
+  "source/i18n/casetrn.h",
+  "source/i18n/cecal.cpp",
+  "source/i18n/cecal.h",
+  "source/i18n/chnsecal.cpp",
+  "source/i18n/chnsecal.h",
+  "source/i18n/choicfmt.cpp",
+  "source/i18n/coleitr.cpp",
+  "source/i18n/collationbuilder.cpp",
+  "source/i18n/collationbuilder.h",
+  "source/i18n/collationcompare.cpp",
+  "source/i18n/collationcompare.h",
+  "source/i18n/collation.cpp",
+  "source/i18n/collationdatabuilder.cpp",
+  "source/i18n/collationdatabuilder.h",
+  "source/i18n/collationdata.cpp",
+  "source/i18n/collationdata.h",
+  "source/i18n/collationdatareader.cpp",
+  "source/i18n/collationdatareader.h",
+  "source/i18n/collationdatawriter.cpp",
+  "source/i18n/collationdatawriter.h",
+  "source/i18n/collationfastlatinbuilder.cpp",
+  "source/i18n/collationfastlatinbuilder.h",
+  "source/i18n/collationfastlatin.cpp",
+  "source/i18n/collationfastlatin.h",
+  "source/i18n/collationfcd.cpp",
+  "source/i18n/collationfcd.h",
+  "source/i18n/collation.h",
+  "source/i18n/collationiterator.cpp",
+  "source/i18n/collationiterator.h",
+  "source/i18n/collationkeys.cpp",
+  "source/i18n/collationkeys.h",
+  "source/i18n/collationroot.cpp",
+  "source/i18n/collationrootelements.cpp",
+  "source/i18n/collationrootelements.h",
+  "source/i18n/collationroot.h",
+  "source/i18n/collationruleparser.cpp",
+  "source/i18n/collationruleparser.h",
+  "source/i18n/collationsets.cpp",
+  "source/i18n/collationsets.h",
+  "source/i18n/collationsettings.cpp",
+  "source/i18n/collationsettings.h",
+  "source/i18n/collationtailoring.cpp",
+  "source/i18n/collationtailoring.h",
+  "source/i18n/collationweights.cpp",
+  "source/i18n/collationweights.h",
+  "source/i18n/coll.cpp",
+  "source/i18n/collunsafe.h",
+  "source/i18n/compactdecimalformat.cpp",
+  "source/i18n/coptccal.cpp",
+  "source/i18n/coptccal.h",
+  "source/i18n/cpdtrans.cpp",
+  "source/i18n/cpdtrans.h",
+  "source/i18n/csdetect.cpp",
+  "source/i18n/csdetect.h",
+  "source/i18n/csmatch.cpp",
+  "source/i18n/csmatch.h",
+  "source/i18n/csr2022.cpp",
+  "source/i18n/csr2022.h",
+  "source/i18n/csrecog.cpp",
+  "source/i18n/csrecog.h",
+  "source/i18n/csrmbcs.cpp",
+  "source/i18n/csrmbcs.h",
+  "source/i18n/csrsbcs.cpp",
+  "source/i18n/csrsbcs.h",
+  "source/i18n/csrucode.cpp",
+  "source/i18n/csrucode.h",
+  "source/i18n/csrutf8.cpp",
+  "source/i18n/csrutf8.h",
+  "source/i18n/curramt.cpp",
+  "source/i18n/currfmt.cpp",
+  "source/i18n/currfmt.h",
+  "source/i18n/currpinf.cpp",
+  "source/i18n/currunit.cpp",
+  "source/i18n/dangical.cpp",
+  "source/i18n/dangical.h",
+  "source/i18n/datefmt.cpp",
+  "source/i18n/dayperiodrules.cpp",
+  "source/i18n/dayperiodrules.h",
+  "source/i18n/dcfmtsym.cpp",
+  "source/i18n/decContext.cpp",
+  "source/i18n/decContext.h",
+  "source/i18n/decimfmt.cpp",
+  "source/i18n/decNumber.cpp",
+  "source/i18n/decNumber.h",
+  "source/i18n/decNumberLocal.h",
+  "source/i18n/double-conversion-bignum.cpp",
+  "source/i18n/double-conversion-bignum-dtoa.cpp",
+  "source/i18n/double-conversion-bignum-dtoa.h",
+  "source/i18n/double-conversion-bignum.h",
+  "source/i18n/double-conversion-cached-powers.cpp",
+  "source/i18n/double-conversion-cached-powers.h",
+  "source/i18n/double-conversion-diy-fp.h",
+  "source/i18n/double-conversion-double-to-string.cpp",
+  "source/i18n/double-conversion-double-to-string.h",
+  "source/i18n/double-conversion-fast-dtoa.cpp",
+  "source/i18n/double-conversion-fast-dtoa.h",
+  "source/i18n/double-conversion.h",
+  "source/i18n/double-conversion-ieee.h",
+  "source/i18n/double-conversion-string-to-double.cpp",
+  "source/i18n/double-conversion-string-to-double.h",
+  "source/i18n/double-conversion-strtod.cpp",
+  "source/i18n/double-conversion-strtod.h",
+  "source/i18n/double-conversion-utils.h",
+  "source/i18n/dtfmtsym.cpp",
+  "source/i18n/dt_impl.h",
+  "source/i18n/dtitvfmt.cpp",
+  "source/i18n/dtitv_impl.h",
+  "source/i18n/dtitvinf.cpp",
+  "source/i18n/dtptngen.cpp",
+  "source/i18n/dtptngen_impl.h",
+  "source/i18n/dtrule.cpp",
+  "source/i18n/erarules.cpp",
+  "source/i18n/erarules.h",
+  "source/i18n/esctrn.cpp",
+  "source/i18n/esctrn.h",
+  "source/i18n/ethpccal.cpp",
+  "source/i18n/ethpccal.h",
+  "source/i18n/fmtable_cnv.cpp",
+  "source/i18n/fmtable.cpp",
+  "source/i18n/fmtableimp.h",
+  "source/i18n/format.cpp",
+  "source/i18n/formatted_string_builder.cpp",
+  "source/i18n/formatted_string_builder.h",
+  "source/i18n/formattedval_impl.h",
+  "source/i18n/formattedval_iterimpl.cpp",
+  "source/i18n/formattedval_sbimpl.cpp",
+  "source/i18n/formattedvalue.cpp",
+  "source/i18n/fphdlimp.cpp",
+  "source/i18n/fphdlimp.h",
+  "source/i18n/fpositer.cpp",
+  "source/i18n/funcrepl.cpp",
+  "source/i18n/funcrepl.h",
+  "source/i18n/gender.cpp",
+  "source/i18n/gregocal.cpp",
+  "source/i18n/gregoimp.cpp",
+  "source/i18n/gregoimp.h",
+  "source/i18n/hebrwcal.cpp",
+  "source/i18n/hebrwcal.h",
+  "source/i18n/indiancal.cpp",
+  "source/i18n/indiancal.h",
+  "source/i18n/inputext.cpp",
+  "source/i18n/inputext.h",
+  "source/i18n/islamcal.cpp",
+  "source/i18n/islamcal.h",
+  "source/i18n/japancal.cpp",
+  "source/i18n/japancal.h",
+  "source/i18n/listformatter.cpp",
+  "source/i18n/measfmt.cpp",
+  "source/i18n/measunit.cpp",
+  "source/i18n/measunit_extra.cpp",
+  "source/i18n/measunit_impl.h",
+  "source/i18n/measure.cpp",
+  "source/i18n/msgfmt.cpp",
+  "source/i18n/msgfmt_impl.h",
+  "source/i18n/name2uni.cpp",
+  "source/i18n/name2uni.h",
+  "source/i18n/nfrlist.h",
+  "source/i18n/nfrs.cpp",
+  "source/i18n/nfrs.h",
+  "source/i18n/nfrule.cpp",
+  "source/i18n/nfrule.h",
+  "source/i18n/nfsubs.cpp",
+  "source/i18n/nfsubs.h",
+  "source/i18n/nortrans.cpp",
+  "source/i18n/nortrans.h",
+  "source/i18n/nounit.cpp",
+  "source/i18n/nultrans.cpp",
+  "source/i18n/nultrans.h",
+  "source/i18n/number_affixutils.cpp",
+  "source/i18n/number_affixutils.h",
+  "source/i18n/number_asformat.cpp",
+  "source/i18n/number_asformat.h",
+  "source/i18n/number_capi.cpp",
+  "source/i18n/number_compact.cpp",
+  "source/i18n/number_compact.h",
+  "source/i18n/number_currencysymbols.cpp",
+  "source/i18n/number_currencysymbols.h",
+  "source/i18n/number_decimalquantity.cpp",
+  "source/i18n/number_decimalquantity.h",
+  "source/i18n/number_decimfmtprops.cpp",
+  "source/i18n/number_decimfmtprops.h",
+  "source/i18n/number_decnum.h",
+  "source/i18n/number_fluent.cpp",
+  "source/i18n/number_formatimpl.cpp",
+  "source/i18n/number_formatimpl.h",
+  "source/i18n/number_grouping.cpp",
+  "source/i18n/number_integerwidth.cpp",
+  "source/i18n/number_longnames.cpp",
+  "source/i18n/number_longnames.h",
+  "source/i18n/number_mapper.cpp",
+  "source/i18n/number_mapper.h",
+  "source/i18n/number_microprops.h",
+  "source/i18n/number_modifiers.cpp",
+  "source/i18n/number_modifiers.h",
+  "source/i18n/number_multiplier.cpp",
+  "source/i18n/number_multiplier.h",
+  "source/i18n/number_notation.cpp",
+  "source/i18n/number_output.cpp",
+  "source/i18n/number_padding.cpp",
+  "source/i18n/number_patternmodifier.cpp",
+  "source/i18n/number_patternmodifier.h",
+  "source/i18n/number_patternstring.cpp",
+  "source/i18n/number_patternstring.h",
+  "source/i18n/number_rounding.cpp",
+  "source/i18n/number_roundingutils.h",
+  "source/i18n/number_scientific.cpp",
+  "source/i18n/number_scientific.h",
+  "source/i18n/number_skeletons.cpp",
+  "source/i18n/number_skeletons.h",
+  "source/i18n/number_types.h",
+  "source/i18n/number_utils.cpp",
+  "source/i18n/number_utils.h",
+  "source/i18n/number_utypes.h",
+  "source/i18n/numfmt.cpp",
+  "source/i18n/numparse_affixes.cpp",
+  "source/i18n/numparse_affixes.h",
+  "source/i18n/numparse_compositions.cpp",
+  "source/i18n/numparse_compositions.h",
+  "source/i18n/numparse_currency.cpp",
+  "source/i18n/numparse_currency.h",
+  "source/i18n/numparse_decimal.cpp",
+  "source/i18n/numparse_decimal.h",
+  "source/i18n/numparse_impl.cpp",
+  "source/i18n/numparse_impl.h",
+  "source/i18n/numparse_parsednumber.cpp",
+  "source/i18n/numparse_scientific.cpp",
+  "source/i18n/numparse_scientific.h",
+  "source/i18n/numparse_symbols.cpp",
+  "source/i18n/numparse_symbols.h",
+  "source/i18n/numparse_types.h",
+  "source/i18n/numparse_utils.h",
+  "source/i18n/numparse_validators.cpp",
+  "source/i18n/numparse_validators.h",
+  "source/i18n/numrange_fluent.cpp",
+  "source/i18n/numrange_impl.cpp",
+  "source/i18n/numrange_impl.h",
+  "source/i18n/numsys.cpp",
+  "source/i18n/numsys_impl.h",
+  "source/i18n/olsontz.cpp",
+  "source/i18n/olsontz.h",
+  "source/i18n/persncal.cpp",
+  "source/i18n/persncal.h",
+  "source/i18n/plurfmt.cpp",
+  "source/i18n/plurrule.cpp",
+  "source/i18n/plurrule_impl.h",
+  "source/i18n/quant.cpp",
+  "source/i18n/quant.h",
+  "source/i18n/quantityformatter.cpp",
+  "source/i18n/quantityformatter.h",
+  "source/i18n/rbnf.cpp",
+  "source/i18n/rbt.cpp",
+  "source/i18n/rbt_data.cpp",
+  "source/i18n/rbt_data.h",
+  "source/i18n/rbt.h",
+  "source/i18n/rbt_pars.cpp",
+  "source/i18n/rbt_pars.h",
+  "source/i18n/rbt_rule.cpp",
+  "source/i18n/rbt_rule.h",
+  "source/i18n/rbt_set.cpp",
+  "source/i18n/rbt_set.h",
+  "source/i18n/rbtz.cpp",
+  "source/i18n/regexcmp.cpp",
+  "source/i18n/regexcmp.h",
+  "source/i18n/regexcst.h",
+  "source/i18n/regeximp.cpp",
+  "source/i18n/regeximp.h",
+  "source/i18n/regexst.cpp",
+  "source/i18n/regexst.h",
+  "source/i18n/regextxt.cpp",
+  "source/i18n/regextxt.h",
+  "source/i18n/region.cpp",
+  "source/i18n/region_impl.h",
+  "source/i18n/reldatefmt.cpp",
+  "source/i18n/reldtfmt.cpp",
+  "source/i18n/reldtfmt.h",
+  "source/i18n/rematch.cpp",
+  "source/i18n/remtrans.cpp",
+  "source/i18n/remtrans.h",
+  "source/i18n/repattrn.cpp",
+  "source/i18n/rulebasedcollator.cpp",
+  "source/i18n/scientificnumberformatter.cpp",
+  "source/i18n/scriptset.cpp",
+  "source/i18n/scriptset.h",
+  "source/i18n/search.cpp",
+  "source/i18n/selfmt.cpp",
+  "source/i18n/selfmtimpl.h",
+  "source/i18n/sharedbreakiterator.cpp",
+  "source/i18n/sharedbreakiterator.h",
+  "source/i18n/sharedcalendar.h",
+  "source/i18n/shareddateformatsymbols.h",
+  "source/i18n/sharednumberformat.h",
+  "source/i18n/sharedpluralrules.h",
+  "source/i18n/simpletz.cpp",
+  "source/i18n/smpdtfmt.cpp",
+  "source/i18n/smpdtfst.cpp",
+  "source/i18n/smpdtfst.h",
+  "source/i18n/sortkey.cpp",
+  "source/i18n/standardplural.cpp",
+  "source/i18n/standardplural.h",
+  "source/i18n/string_segment.cpp",
+  "source/i18n/string_segment.h",
+  "source/i18n/strmatch.cpp",
+  "source/i18n/strmatch.h",
+  "source/i18n/strrepl.cpp",
+  "source/i18n/strrepl.h",
+  "source/i18n/stsearch.cpp",
+  "source/i18n/taiwncal.cpp",
+  "source/i18n/taiwncal.h",
+  "source/i18n/timezone.cpp",
+  "source/i18n/titletrn.cpp",
+  "source/i18n/titletrn.h",
+  "source/i18n/tmunit.cpp",
+  "source/i18n/tmutamt.cpp",
+  "source/i18n/tmutfmt.cpp",
+  "source/i18n/tolowtrn.cpp",
+  "source/i18n/tolowtrn.h",
+  "source/i18n/toupptrn.cpp",
+  "source/i18n/toupptrn.h",
+  "source/i18n/translit.cpp",
+  "source/i18n/transreg.cpp",
+  "source/i18n/transreg.h",
+  "source/i18n/tridpars.cpp",
+  "source/i18n/tridpars.h",
+  "source/i18n/tzfmt.cpp",
+  "source/i18n/tzgnames.cpp",
+  "source/i18n/tzgnames.h",
+  "source/i18n/tznames.cpp",
+  "source/i18n/tznames_impl.cpp",
+  "source/i18n/tznames_impl.h",
+  "source/i18n/tzrule.cpp",
+  "source/i18n/tztrans.cpp",
+  "source/i18n/ucal.cpp",
+  "source/i18n/ucln_in.cpp",
+  "source/i18n/ucln_in.h",
+  "source/i18n/ucol.cpp",
+  "source/i18n/ucoleitr.cpp",
+  "source/i18n/ucol_imp.h",
+  "source/i18n/ucol_res.cpp",
+  "source/i18n/ucol_sit.cpp",
+  "source/i18n/ucsdet.cpp",
+  "source/i18n/udat.cpp",
+  "source/i18n/udateintervalformat.cpp",
+  "source/i18n/udatpg.cpp",
+  "source/i18n/ufieldpositer.cpp",
+  "source/i18n/uitercollationiterator.cpp",
+  "source/i18n/uitercollationiterator.h",
+  "source/i18n/ulistformatter.cpp",
+  "source/i18n/ulocdata.cpp",
+  "source/i18n/umsg.cpp",
+  "source/i18n/umsg_imp.h",
+  "source/i18n/unesctrn.cpp",
+  "source/i18n/unesctrn.h",
+  "source/i18n/uni2name.cpp",
+  "source/i18n/uni2name.h",
+  "source/i18n/unum.cpp",
+  "source/i18n/unumsys.cpp",
+  "source/i18n/upluralrules.cpp",
+  "source/i18n/uregexc.cpp",
+  "source/i18n/uregex.cpp",
+  "source/i18n/uregion.cpp",
+  "source/i18n/usearch.cpp",
+  "source/i18n/uspoof_build.cpp",
+  "source/i18n/uspoof_conf.cpp",
+  "source/i18n/uspoof_conf.h",
+  "source/i18n/uspoof.cpp",
+  "source/i18n/uspoof_impl.cpp",
+  "source/i18n/uspoof_impl.h",
+  "source/i18n/usrchimp.h",
+  "source/i18n/utf16collationiterator.cpp",
+  "source/i18n/utf16collationiterator.h",
+  "source/i18n/utf8collationiterator.cpp",
+  "source/i18n/utf8collationiterator.h",
+  "source/i18n/utmscale.cpp",
+  "source/i18n/utrans.cpp",
+  "source/i18n/vtzone.cpp",
+  "source/i18n/vzone.cpp",
+  "source/i18n/vzone.h",
+  "source/i18n/windtfmt.cpp",
+  "source/i18n/windtfmt.h",
+  "source/i18n/winnmfmt.cpp",
+  "source/i18n/winnmfmt.h",
+  "source/i18n/wintzimpl.cpp",
+  "source/i18n/wintzimpl.h",
+  "source/i18n/zonemeta.cpp",
+  "source/i18n/zonemeta.h",
+  "source/i18n/zrule.cpp",
+  "source/i18n/zrule.h",
+  "source/i18n/ztrans.cpp",
+  "source/i18n/ztrans.h",
+  # I18N_SRC_END
+]
+
+# ls source/i18n/unicode/*h | sort | sed 's/^\(.*\)$/  "\1",/'
+icu18n_public = [
+  # crbug.com/726654: Make astro.h public until the upstream adds an API.
+  "source/i18n/astro.h",
+  # I18N_HDR_START
+  "source/i18n/unicode/alphaindex.h",
+  "source/i18n/unicode/basictz.h",
+  "source/i18n/unicode/calendar.h",
+  "source/i18n/unicode/choicfmt.h",
+  "source/i18n/unicode/coleitr.h",
+  "source/i18n/unicode/coll.h",
+  "source/i18n/unicode/compactdecimalformat.h",
+  "source/i18n/unicode/curramt.h",
+  "source/i18n/unicode/currpinf.h",
+  "source/i18n/unicode/currunit.h",
+  "source/i18n/unicode/datefmt.h",
+  "source/i18n/unicode/dcfmtsym.h",
+  "source/i18n/unicode/decimfmt.h",
+  "source/i18n/unicode/dtfmtsym.h",
+  "source/i18n/unicode/dtitvfmt.h",
+  "source/i18n/unicode/dtitvinf.h",
+  "source/i18n/unicode/dtptngen.h",
+  "source/i18n/unicode/dtrule.h",
+  "source/i18n/unicode/fieldpos.h",
+  "source/i18n/unicode/fmtable.h",
+  "source/i18n/unicode/format.h",
+  "source/i18n/unicode/formattedvalue.h",
+  "source/i18n/unicode/fpositer.h",
+  "source/i18n/unicode/gender.h",
+  "source/i18n/unicode/gregocal.h",
+  "source/i18n/unicode/listformatter.h",
+  "source/i18n/unicode/measfmt.h",
+  "source/i18n/unicode/measunit.h",
+  "source/i18n/unicode/measure.h",
+  "source/i18n/unicode/msgfmt.h",
+  "source/i18n/unicode/nounit.h",
+  "source/i18n/unicode/numberformatter.h",
+  "source/i18n/unicode/numberrangeformatter.h",
+  "source/i18n/unicode/numfmt.h",
+  "source/i18n/unicode/numsys.h",
+  "source/i18n/unicode/plurfmt.h",
+  "source/i18n/unicode/plurrule.h",
+  "source/i18n/unicode/rbnf.h",
+  "source/i18n/unicode/rbtz.h",
+  "source/i18n/unicode/regex.h",
+  "source/i18n/unicode/region.h",
+  "source/i18n/unicode/reldatefmt.h",
+  "source/i18n/unicode/scientificnumberformatter.h",
+  "source/i18n/unicode/search.h",
+  "source/i18n/unicode/selfmt.h",
+  "source/i18n/unicode/simpletz.h",
+  "source/i18n/unicode/smpdtfmt.h",
+  "source/i18n/unicode/sortkey.h",
+  "source/i18n/unicode/stsearch.h",
+  "source/i18n/unicode/tblcoll.h",
+  "source/i18n/unicode/timezone.h",
+  "source/i18n/unicode/tmunit.h",
+  "source/i18n/unicode/tmutamt.h",
+  "source/i18n/unicode/tmutfmt.h",
+  "source/i18n/unicode/translit.h",
+  "source/i18n/unicode/tzfmt.h",
+  "source/i18n/unicode/tznames.h",
+  "source/i18n/unicode/tzrule.h",
+  "source/i18n/unicode/tztrans.h",
+  "source/i18n/unicode/ucal.h",
+  "source/i18n/unicode/ucoleitr.h",
+  "source/i18n/unicode/ucol.h",
+  "source/i18n/unicode/ucsdet.h",
+  "source/i18n/unicode/udateintervalformat.h",
+  "source/i18n/unicode/udat.h",
+  "source/i18n/unicode/udatpg.h",
+  "source/i18n/unicode/ufieldpositer.h",
+  "source/i18n/unicode/uformattable.h",
+  "source/i18n/unicode/uformattedvalue.h",
+  "source/i18n/unicode/ugender.h",
+  "source/i18n/unicode/ulistformatter.h",
+  "source/i18n/unicode/ulocdata.h",
+  "source/i18n/unicode/umsg.h",
+  "source/i18n/unicode/unirepl.h",
+  "source/i18n/unicode/unumberformatter.h",
+  "source/i18n/unicode/unum.h",
+  "source/i18n/unicode/unumsys.h",
+  "source/i18n/unicode/upluralrules.h",
+  "source/i18n/unicode/uregex.h",
+  "source/i18n/unicode/uregion.h",
+  "source/i18n/unicode/ureldatefmt.h",
+  "source/i18n/unicode/usearch.h",
+  "source/i18n/unicode/uspoof.h",
+  "source/i18n/unicode/utmscale.h",
+  "source/i18n/unicode/utrans.h",
+  "source/i18n/unicode/vtzone.h",
+  # I18N_HDR_END
+]
+
+# find  source/common -maxdepth 1  ! -type d  | egrep  '\.(c|cpp|h)$' |\
+# sort | sed 's/^\(.*\)$/  "\1",/'
+icuuc_sources = [
+  # COMMON_SRC_START
+  "source/common/appendable.cpp",
+  "source/common/bmpset.cpp",
+  "source/common/bmpset.h",
+  "source/common/brkeng.cpp",
+  "source/common/brkeng.h",
+  "source/common/brkiter.cpp",
+  "source/common/bytesinkutil.cpp",
+  "source/common/bytesinkutil.h",
+  "source/common/bytestream.cpp",
+  "source/common/bytestriebuilder.cpp",
+  "source/common/bytestrie.cpp",
+  "source/common/bytestrieiterator.cpp",
+  "source/common/caniter.cpp",
+  "source/common/capi_helper.h",
+  "source/common/characterproperties.cpp",
+  "source/common/chariter.cpp",
+  "source/common/charstr.cpp",
+  "source/common/charstr.h",
+  "source/common/cmemory.cpp",
+  "source/common/cmemory.h",
+  "source/common/cpputils.h",
+  "source/common/cstr.cpp",
+  "source/common/cstr.h",
+  "source/common/cstring.cpp",
+  "source/common/cstring.h",
+  "source/common/cwchar.cpp",
+  "source/common/cwchar.h",
+  "source/common/dictbe.cpp",
+  "source/common/dictbe.h",
+  "source/common/dictionarydata.cpp",
+  "source/common/dictionarydata.h",
+  "source/common/dtintrv.cpp",
+  "source/common/edits.cpp",
+  "source/common/errorcode.cpp",
+  "source/common/filteredbrk.cpp",
+  "source/common/filterednormalizer2.cpp",
+  "source/common/hash.h",
+  "source/common/icudataver.cpp",
+  "source/common/icuplug.cpp",
+  "source/common/icuplugimp.h",
+  "source/common/loadednormalizer2impl.cpp",
+  "source/common/localebuilder.cpp",
+  "source/common/localematcher.cpp",
+  "source/common/localeprioritylist.cpp",
+  "source/common/localeprioritylist.h",
+  "source/common/localsvc.h",
+  "source/common/locavailable.cpp",
+  "source/common/locbased.cpp",
+  "source/common/locbased.h",
+  "source/common/locdispnames.cpp",
+  "source/common/locdistance.cpp",
+  "source/common/locdistance.h",
+  "source/common/locdspnm.cpp",
+  "source/common/locid.cpp",
+  "source/common/loclikely.cpp",
+  "source/common/loclikelysubtags.cpp",
+  "source/common/loclikelysubtags.h",
+  "source/common/locmap.cpp",
+  "source/common/locmap.h",
+  "source/common/locresdata.cpp",
+  "source/common/locutil.cpp",
+  "source/common/locutil.h",
+  "source/common/lsr.cpp",
+  "source/common/lsr.h",
+  "source/common/messageimpl.h",
+  "source/common/messagepattern.cpp",
+  "source/common/msvcres.h",
+  "source/common/mutex.h",
+  "source/common/norm2allmodes.h",
+  "source/common/norm2_nfc_data.h",
+  "source/common/normalizer2.cpp",
+  "source/common/normalizer2impl.cpp",
+  "source/common/normalizer2impl.h",
+  "source/common/normlzr.cpp",
+  "source/common/parsepos.cpp",
+  "source/common/patternprops.cpp",
+  "source/common/patternprops.h",
+  "source/common/pluralmap.cpp",
+  "source/common/pluralmap.h",
+  "source/common/propname.cpp",
+  "source/common/propname_data.h",
+  "source/common/propname.h",
+  "source/common/propsvec.cpp",
+  "source/common/propsvec.h",
+  "source/common/punycode.cpp",
+  "source/common/punycode.h",
+  "source/common/putil.cpp",
+  "source/common/putilimp.h",
+  "source/common/rbbi_cache.cpp",
+  "source/common/rbbi_cache.h",
+  "source/common/rbbi.cpp",
+  "source/common/rbbidata.cpp",
+  "source/common/rbbidata.h",
+  "source/common/rbbinode.cpp",
+  "source/common/rbbinode.h",
+  "source/common/rbbirb.cpp",
+  "source/common/rbbirb.h",
+  "source/common/rbbirpt.h",
+  "source/common/rbbiscan.cpp",
+  "source/common/rbbiscan.h",
+  "source/common/rbbisetb.cpp",
+  "source/common/rbbisetb.h",
+  "source/common/rbbistbl.cpp",
+  "source/common/rbbitblb.cpp",
+  "source/common/rbbitblb.h",
+  "source/common/resbund_cnv.cpp",
+  "source/common/resbund.cpp",
+  "source/common/resource.cpp",
+  "source/common/resource.h",
+  "source/common/restrace.cpp",
+  "source/common/restrace.h",
+  "source/common/ruleiter.cpp",
+  "source/common/ruleiter.h",
+  "source/common/schriter.cpp",
+  "source/common/serv.cpp",
+  "source/common/serv.h",
+  "source/common/servlk.cpp",
+  "source/common/servlkf.cpp",
+  "source/common/servloc.h",
+  "source/common/servls.cpp",
+  "source/common/servnotf.cpp",
+  "source/common/servnotf.h",
+  "source/common/servrbf.cpp",
+  "source/common/servslkf.cpp",
+  "source/common/sharedobject.cpp",
+  "source/common/sharedobject.h",
+  "source/common/simpleformatter.cpp",
+  "source/common/sprpimpl.h",
+  "source/common/static_unicode_sets.cpp",
+  "source/common/static_unicode_sets.h",
+  "source/common/stringpiece.cpp",
+  "source/common/stringtriebuilder.cpp",
+  "source/common/uarrsort.cpp",
+  "source/common/uarrsort.h",
+  "source/common/uassert.h",
+  "source/common/ubidi.cpp",
+  "source/common/ubidiimp.h",
+  "source/common/ubidiln.cpp",
+  "source/common/ubidi_props.cpp",
+  "source/common/ubidi_props_data.h",
+  "source/common/ubidi_props.h",
+  "source/common/ubiditransform.cpp",
+  "source/common/ubidiwrt.cpp",
+  "source/common/ubrk.cpp",
+  "source/common/ubrkimpl.h",
+  "source/common/ucase.cpp",
+  "source/common/ucase.h",
+  "source/common/ucasemap.cpp",
+  "source/common/ucasemap_imp.h",
+  "source/common/ucasemap_titlecase_brkiter.cpp",
+  "source/common/ucase_props_data.h",
+  "source/common/ucat.cpp",
+  "source/common/uchar.cpp",
+  "source/common/uchar_props_data.h",
+  "source/common/ucharstriebuilder.cpp",
+  "source/common/ucharstrie.cpp",
+  "source/common/ucharstrieiterator.cpp",
+  "source/common/uchriter.cpp",
+  "source/common/ucln_cmn.cpp",
+  "source/common/ucln_cmn.h",
+  "source/common/ucln.h",
+  "source/common/ucln_imp.h",
+  "source/common/ucmndata.cpp",
+  "source/common/ucmndata.h",
+  "source/common/ucnv2022.cpp",
+  "source/common/ucnv_bld.cpp",
+  "source/common/ucnv_bld.h",
+  "source/common/ucnvbocu.cpp",
+  "source/common/ucnv_cb.cpp",
+  "source/common/ucnv_cnv.cpp",
+  "source/common/ucnv_cnv.h",
+  "source/common/ucnv.cpp",
+  "source/common/ucnv_ct.cpp",
+  "source/common/ucnvdisp.cpp",
+  "source/common/ucnv_err.cpp",
+  "source/common/ucnv_ext.cpp",
+  "source/common/ucnv_ext.h",
+  "source/common/ucnvhz.cpp",
+  "source/common/ucnv_imp.h",
+  "source/common/ucnv_io.cpp",
+  "source/common/ucnv_io.h",
+  "source/common/ucnvisci.cpp",
+  "source/common/ucnvlat1.cpp",
+  "source/common/ucnv_lmb.cpp",
+  "source/common/ucnvmbcs.cpp",
+  "source/common/ucnvmbcs.h",
+  "source/common/ucnvscsu.cpp",
+  "source/common/ucnvsel.cpp",
+  "source/common/ucnv_set.cpp",
+  "source/common/ucnv_u16.cpp",
+  "source/common/ucnv_u32.cpp",
+  "source/common/ucnv_u7.cpp",
+  "source/common/ucnv_u8.cpp",
+  "source/common/ucol_data.h",
+  "source/common/ucol_swp.cpp",
+  "source/common/ucol_swp.h",
+  "source/common/ucptrie.cpp",
+  "source/common/ucptrie_impl.h",
+  "source/common/ucurr.cpp",
+  "source/common/ucurrimp.h",
+  "source/common/udata.cpp",
+  "source/common/udatamem.cpp",
+  "source/common/udatamem.h",
+  "source/common/udataswp.cpp",
+  "source/common/udataswp.h",
+  "source/common/uelement.h",
+  "source/common/uenum.cpp",
+  "source/common/uenumimp.h",
+  "source/common/uhash.cpp",
+  "source/common/uhash.h",
+  "source/common/uhash_us.cpp",
+  "source/common/uidna.cpp",
+  "source/common/uinit.cpp",
+  "source/common/uinvchar.cpp",
+  "source/common/uinvchar.h",
+  "source/common/uiter.cpp",
+  "source/common/ulayout_props.h",
+  "source/common/ulist.cpp",
+  "source/common/ulist.h",
+  "source/common/uloc.cpp",
+  "source/common/ulocimp.h",
+  "source/common/uloc_keytype.cpp",
+  "source/common/uloc_tag.cpp",
+  "source/common/umapfile.cpp",
+  "source/common/umapfile.h",
+  "source/common/umath.cpp",
+  "source/common/umutablecptrie.cpp",
+  "source/common/umutex.cpp",
+  "source/common/umutex.h",
+  "source/common/unames.cpp",
+  "source/common/unifiedcache.cpp",
+  "source/common/unifiedcache.h",
+  "source/common/unifilt.cpp",
+  "source/common/unifunct.cpp",
+  "source/common/uniset_closure.cpp",
+  "source/common/uniset.cpp",
+  "source/common/uniset_props.cpp",
+  "source/common/unisetspan.cpp",
+  "source/common/unisetspan.h",
+  "source/common/unistrappender.h",
+  "source/common/unistr_case.cpp",
+  "source/common/unistr_case_locale.cpp",
+  "source/common/unistr_cnv.cpp",
+  "source/common/unistr.cpp",
+  "source/common/unistr_props.cpp",
+  "source/common/unistr_titlecase_brkiter.cpp",
+  "source/common/unormcmp.cpp",
+  "source/common/unorm.cpp",
+  "source/common/unormimp.h",
+  "source/common/uobject.cpp",
+  "source/common/uposixdefs.h",
+  "source/common/uprops.cpp",
+  "source/common/uprops.h",
+  "source/common/uresbund.cpp",
+  "source/common/ures_cnv.cpp",
+  "source/common/uresdata.cpp",
+  "source/common/uresdata.h",
+  "source/common/uresimp.h",
+  "source/common/ureslocs.h",
+  "source/common/usc_impl.cpp",
+  "source/common/usc_impl.h",
+  "source/common/uscript.cpp",
+  "source/common/uscript_props.cpp",
+  "source/common/uset.cpp",
+  "source/common/uset_imp.h",
+  "source/common/usetiter.cpp",
+  "source/common/uset_props.cpp",
+  "source/common/ushape.cpp",
+  "source/common/usprep.cpp",
+  "source/common/ustack.cpp",
+  "source/common/ustrcase.cpp",
+  "source/common/ustrcase_locale.cpp",
+  "source/common/ustr_cnv.cpp",
+  "source/common/ustr_cnv.h",
+  "source/common/ustrenum.cpp",
+  "source/common/ustrenum.h",
+  "source/common/ustrfmt.cpp",
+  "source/common/ustrfmt.h",
+  "source/common/ustr_imp.h",
+  "source/common/ustring.cpp",
+  "source/common/ustr_titlecase_brkiter.cpp",
+  "source/common/ustrtrns.cpp",
+  "source/common/ustr_wcs.cpp",
+  "source/common/utext.cpp",
+  "source/common/utf_impl.cpp",
+  "source/common/util.cpp",
+  "source/common/util.h",
+  "source/common/util_props.cpp",
+  "source/common/utrace.cpp",
+  "source/common/utracimp.h",
+  "source/common/utrie2_builder.cpp",
+  "source/common/utrie2.cpp",
+  "source/common/utrie2.h",
+  "source/common/utrie2_impl.h",
+  "source/common/utrie.cpp",
+  "source/common/utrie.h",
+  "source/common/utrie_swap.cpp",
+  "source/common/uts46.cpp",
+  "source/common/utypeinfo.h",
+  "source/common/utypes.cpp",
+  "source/common/uvector.cpp",
+  "source/common/uvector.h",
+  "source/common/uvectr32.cpp",
+  "source/common/uvectr32.h",
+  "source/common/uvectr64.cpp",
+  "source/common/uvectr64.h",
+  "source/common/wintz.cpp",
+  "source/common/wintz.h",
+  # COMMON_SRC_END
+]
+
+# ls  source/common/unicode/*h | sort | sed 's/^\(.*\)$/  "\1",/'
+icuuc_public = [
+  # COMMON_HDR_START
+  "source/common/unicode/appendable.h",
+  "source/common/unicode/brkiter.h",
+  "source/common/unicode/bytestream.h",
+  "source/common/unicode/bytestriebuilder.h",
+  "source/common/unicode/bytestrie.h",
+  "source/common/unicode/caniter.h",
+  "source/common/unicode/casemap.h",
+  "source/common/unicode/char16ptr.h",
+  "source/common/unicode/chariter.h",
+  "source/common/unicode/dbbi.h",
+  "source/common/unicode/docmain.h",
+  "source/common/unicode/dtintrv.h",
+  "source/common/unicode/edits.h",
+  "source/common/unicode/enumset.h",
+  "source/common/unicode/errorcode.h",
+  "source/common/unicode/filteredbrk.h",
+  "source/common/unicode/icudataver.h",
+  "source/common/unicode/icuplug.h",
+  "source/common/unicode/idna.h",
+  "source/common/unicode/localebuilder.h",
+  "source/common/unicode/localematcher.h",
+  "source/common/unicode/localpointer.h",
+  "source/common/unicode/locdspnm.h",
+  "source/common/unicode/locid.h",
+  "source/common/unicode/messagepattern.h",
+  "source/common/unicode/normalizer2.h",
+  "source/common/unicode/normlzr.h",
+  "source/common/unicode/parseerr.h",
+  "source/common/unicode/parsepos.h",
+  "source/common/unicode/platform.h",
+  "source/common/unicode/ptypes.h",
+  "source/common/unicode/putil.h",
+  "source/common/unicode/rbbi.h",
+  "source/common/unicode/rep.h",
+  "source/common/unicode/resbund.h",
+  "source/common/unicode/schriter.h",
+  "source/common/unicode/simpleformatter.h",
+  "source/common/unicode/std_string.h",
+  "source/common/unicode/strenum.h",
+  "source/common/unicode/stringoptions.h",
+  "source/common/unicode/stringpiece.h",
+  "source/common/unicode/stringtriebuilder.h",
+  "source/common/unicode/symtable.h",
+  "source/common/unicode/ubidi.h",
+  "source/common/unicode/ubiditransform.h",
+  "source/common/unicode/ubrk.h",
+  "source/common/unicode/ucasemap.h",
+  "source/common/unicode/ucat.h",
+  "source/common/unicode/uchar.h",
+  "source/common/unicode/ucharstriebuilder.h",
+  "source/common/unicode/ucharstrie.h",
+  "source/common/unicode/uchriter.h",
+  "source/common/unicode/uclean.h",
+  "source/common/unicode/ucnv_cb.h",
+  "source/common/unicode/ucnv_err.h",
+  "source/common/unicode/ucnv.h",
+  "source/common/unicode/ucnvsel.h",
+  "source/common/unicode/uconfig.h",
+  "source/common/unicode/ucpmap.h",
+  "source/common/unicode/ucptrie.h",
+  "source/common/unicode/ucurr.h",
+  "source/common/unicode/udata.h",
+  "source/common/unicode/udisplaycontext.h",
+  "source/common/unicode/uenum.h",
+  "source/common/unicode/uidna.h",
+  "source/common/unicode/uiter.h",
+  "source/common/unicode/uldnames.h",
+  "source/common/unicode/uloc.h",
+  "source/common/unicode/umachine.h",
+  "source/common/unicode/umisc.h",
+  "source/common/unicode/umutablecptrie.h",
+  "source/common/unicode/unifilt.h",
+  "source/common/unicode/unifunct.h",
+  "source/common/unicode/unimatch.h",
+  "source/common/unicode/uniset.h",
+  "source/common/unicode/unistr.h",
+  "source/common/unicode/unorm2.h",
+  "source/common/unicode/unorm.h",
+  "source/common/unicode/uobject.h",
+  "source/common/unicode/urename.h",
+  "source/common/unicode/urep.h",
+  "source/common/unicode/ures.h",
+  "source/common/unicode/uscript.h",
+  "source/common/unicode/uset.h",
+  "source/common/unicode/usetiter.h",
+  "source/common/unicode/ushape.h",
+  "source/common/unicode/usprep.h",
+  "source/common/unicode/ustring.h",
+  "source/common/unicode/ustringtrie.h",
+  "source/common/unicode/utext.h",
+  "source/common/unicode/utf16.h",
+  "source/common/unicode/utf32.h",
+  "source/common/unicode/utf8.h",
+  "source/common/unicode/utf.h",
+  "source/common/unicode/utf_old.h",
+  "source/common/unicode/utrace.h",
+  "source/common/unicode/utypes.h",
+  "source/common/unicode/uvernum.h",
+  "source/common/unicode/uversion.h",
+  # COMMON_HDR_END
+]
diff --git a/version.gni b/version.gni
index 9dd95c7..9e1881f 100644
--- a/version.gni
+++ b/version.gni
@@ -1,10 +1,10 @@
-# Copyright 2020 The Fuchsia Authors. All rights reserved.
+# Copyright 2020 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 declare_args() {
   # Contains the major version number of the ICU library, for dependencies that
-  # need different configuration based on the library version.  Currently this
+  # need different configuration based on the library version. Currently this
   # is only useful in Fuchsia.
   icu_major_version_number = "67"
 }