diff --git a/DEPS b/DEPS
index 8a2f270daf..2210c390cb 100644
--- a/DEPS
+++ b/DEPS
@@ -13,7 +13,7 @@ deps = {
   "third_party/externals/expat"           : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55",
   "third_party/externals/freetype"        : "https://skia.googlesource.com/third_party/freetype2.git@7edc937fe679d14d66f55cf6f7fa607925d38f3c",
   "third_party/externals/harfbuzz"        : "https://skia.googlesource.com/third_party/harfbuzz.git@8be74d85534534dbdd39a0a6f496e26e9f3e661d",
-  "third_party/externals/icu"             : "https://chromium.googlesource.com/chromium/deps/icu.git@ec9c1133693148470ffe2e5e53576998e3650c1d",
+  "third_party/externals/icu"             : "https://chromium.googlesource.com/chromium/deps/icu.git@407b39301e71006b68bd38e770f35d32398a7b14",
   "third_party/externals/imgui"           : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@bc6ac8b2aee0614debd940e45bc9cd0d9b355c86",
   # TODO: remove jsoncpp after migrating clients to SkJSON
   "third_party/externals/jsoncpp"         : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0",
@@ -26,7 +26,7 @@ deps = {
   "third_party/externals/opengl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry@14b80ebeab022b2c78f84a573f01028c96075553",
   "third_party/externals/piex"            : "https://android.googlesource.com/platform/external/piex.git@bb217acdca1cc0c16b704669dd6f91a1b509c406",
   "third_party/externals/sdl"             : "https://skia.googlesource.com/third_party/sdl@5d7cfcca344034aff9327f77fc181ae3754e7a90",
-  "third_party/externals/sfntly"          : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916",
+  "third_party/externals/sfntly"          : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@b55ff303ea2f9e26702b514cf6a3196a2e3e2974",
   "third_party/externals/spirv-headers"   : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git@661ad91124e6af2272afd00f804d8aa276e17107",
   "third_party/externals/spirv-tools"     : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@e9e4393b1c5aad7553c05782acefbe32b42644bd",
   "third_party/externals/swiftshader"     : "https://swiftshader.googlesource.com/SwiftShader@f8374cf0e75c0b44782ce903622a9fed1a1d709e",
diff --git a/third_party/icu/BUILD.gn b/third_party/icu/BUILD.gn
index 7233fcc4c9..0b68772127 100644
--- a/third_party/icu/BUILD.gn
+++ b/third_party/icu/BUILD.gn
@@ -15,9 +15,36 @@ if (skia_use_system_icu) {
     defines = [ "U_USING_ICU_NAMESPACE=0" ]
   }
 } else {
+  data_assembly = "$target_gen_dir/icudtl_dat.S"
+  data_dir = "../externals/icu/"
+  if (is_android) {
+    data_dir += "android"
+  } else if (is_ios) {
+    data_dir += "ios"
+  } else {
+    data_dir += "common"
+  }
+  action("make_data_assembly") {
+    script = "../externals/icu/scripts/make_data_assembly.py"
+    inputs = [
+      "$data_dir/icudtl.dat",
+    ]
+    outputs = [
+      "$data_assembly",
+    ]
+    args = [
+      rebase_path(inputs[0], root_build_dir),
+      rebase_path(data_assembly, root_build_dir),
+    ]
+    if (is_mac || is_ios) {
+      args += [ "--mac" ]
+    }
+  }
+
   third_party("icu") {
     public_include_dirs = [
       "../externals/icu/source/common",
+      "../externals/icu/source/i18n",
       ".",
     ]
     public_defines = [ "U_USING_ICU_NAMESPACE=0" ]
@@ -27,188 +54,698 @@ if (skia_use_system_icu) {
       "U_COMMON_IMPLEMENTATION",
       "U_STATIC_IMPLEMENTATION",
       "U_ENABLE_DYLOAD=0",
+      "U_I18N_IMPLEMENTATION",
     ]
     sources = [
       "../externals/icu/source/common/appendable.cpp",
       "../externals/icu/source/common/bmpset.cpp",
+      "../externals/icu/source/common/bmpset.h",
       "../externals/icu/source/common/brkeng.cpp",
+      "../externals/icu/source/common/brkeng.h",
       "../externals/icu/source/common/brkiter.cpp",
+      "../externals/icu/source/common/bytesinkutil.cpp",
+      "../externals/icu/source/common/bytesinkutil.h",
       "../externals/icu/source/common/bytestream.cpp",
       "../externals/icu/source/common/bytestrie.cpp",
       "../externals/icu/source/common/bytestriebuilder.cpp",
       "../externals/icu/source/common/bytestrieiterator.cpp",
       "../externals/icu/source/common/caniter.cpp",
+      "../externals/icu/source/common/characterproperties.cpp",
       "../externals/icu/source/common/chariter.cpp",
       "../externals/icu/source/common/charstr.cpp",
-      "../externals/icu/source/common/cmemory.c",
-      "../externals/icu/source/common/cstring.c",
-      "../externals/icu/source/common/cwchar.c",
+      "../externals/icu/source/common/charstr.h",
+      "../externals/icu/source/common/cmemory.cpp",
+      "../externals/icu/source/common/cmemory.h",
+      "../externals/icu/source/common/cpputils.h",
+      "../externals/icu/source/common/cstr.cpp",
+      "../externals/icu/source/common/cstr.h",
+      "../externals/icu/source/common/cstring.cpp",
+      "../externals/icu/source/common/cstring.h",
+      "../externals/icu/source/common/cwchar.cpp",
+      "../externals/icu/source/common/cwchar.h",
       "../externals/icu/source/common/dictbe.cpp",
+      "../externals/icu/source/common/dictbe.h",
       "../externals/icu/source/common/dictionarydata.cpp",
+      "../externals/icu/source/common/dictionarydata.h",
       "../externals/icu/source/common/dtintrv.cpp",
+      "../externals/icu/source/common/edits.cpp",
       "../externals/icu/source/common/errorcode.cpp",
       "../externals/icu/source/common/filteredbrk.cpp",
       "../externals/icu/source/common/filterednormalizer2.cpp",
-      "../externals/icu/source/common/icudataver.c",
+      "../externals/icu/source/common/hash.h",
+      "../externals/icu/source/common/icudataver.cpp",
       "../externals/icu/source/common/icuplug.cpp",
-      "../externals/icu/source/common/listformatter.cpp",
+      "../externals/icu/source/common/icuplugimp.h",
       "../externals/icu/source/common/loadednormalizer2impl.cpp",
+      "../externals/icu/source/common/localsvc.h",
       "../externals/icu/source/common/locavailable.cpp",
       "../externals/icu/source/common/locbased.cpp",
+      "../externals/icu/source/common/locbased.h",
       "../externals/icu/source/common/locdispnames.cpp",
+      "../externals/icu/source/common/locdspnm.cpp",
       "../externals/icu/source/common/locid.cpp",
       "../externals/icu/source/common/loclikely.cpp",
-      "../externals/icu/source/common/locmap.c",
+      "../externals/icu/source/common/locmap.cpp",
+      "../externals/icu/source/common/locmap.h",
       "../externals/icu/source/common/locresdata.cpp",
       "../externals/icu/source/common/locutil.cpp",
+      "../externals/icu/source/common/locutil.h",
+      "../externals/icu/source/common/messageimpl.h",
       "../externals/icu/source/common/messagepattern.cpp",
+      "../externals/icu/source/common/msvcres.h",
+      "../externals/icu/source/common/mutex.h",
+      "../externals/icu/source/common/norm2_nfc_data.h",
+      "../externals/icu/source/common/norm2allmodes.h",
       "../externals/icu/source/common/normalizer2.cpp",
       "../externals/icu/source/common/normalizer2impl.cpp",
+      "../externals/icu/source/common/normalizer2impl.h",
       "../externals/icu/source/common/normlzr.cpp",
       "../externals/icu/source/common/parsepos.cpp",
       "../externals/icu/source/common/patternprops.cpp",
+      "../externals/icu/source/common/patternprops.h",
       "../externals/icu/source/common/pluralmap.cpp",
+      "../externals/icu/source/common/pluralmap.h",
       "../externals/icu/source/common/propname.cpp",
-      "../externals/icu/source/common/propsvec.c",
+      "../externals/icu/source/common/propname.h",
+      "../externals/icu/source/common/propname_data.h",
+      "../externals/icu/source/common/propsvec.cpp",
+      "../externals/icu/source/common/propsvec.h",
       "../externals/icu/source/common/punycode.cpp",
+      "../externals/icu/source/common/punycode.h",
       "../externals/icu/source/common/putil.cpp",
+      "../externals/icu/source/common/putilimp.h",
       "../externals/icu/source/common/rbbi.cpp",
+      "../externals/icu/source/common/rbbi_cache.cpp",
+      "../externals/icu/source/common/rbbi_cache.h",
       "../externals/icu/source/common/rbbidata.cpp",
+      "../externals/icu/source/common/rbbidata.h",
       "../externals/icu/source/common/rbbinode.cpp",
+      "../externals/icu/source/common/rbbinode.h",
       "../externals/icu/source/common/rbbirb.cpp",
+      "../externals/icu/source/common/rbbirb.h",
+      "../externals/icu/source/common/rbbirpt.h",
       "../externals/icu/source/common/rbbiscan.cpp",
+      "../externals/icu/source/common/rbbiscan.h",
       "../externals/icu/source/common/rbbisetb.cpp",
+      "../externals/icu/source/common/rbbisetb.h",
       "../externals/icu/source/common/rbbistbl.cpp",
       "../externals/icu/source/common/rbbitblb.cpp",
+      "../externals/icu/source/common/rbbitblb.h",
       "../externals/icu/source/common/resbund.cpp",
       "../externals/icu/source/common/resbund_cnv.cpp",
       "../externals/icu/source/common/resource.cpp",
+      "../externals/icu/source/common/resource.h",
       "../externals/icu/source/common/ruleiter.cpp",
+      "../externals/icu/source/common/ruleiter.h",
       "../externals/icu/source/common/schriter.cpp",
       "../externals/icu/source/common/serv.cpp",
+      "../externals/icu/source/common/serv.h",
       "../externals/icu/source/common/servlk.cpp",
       "../externals/icu/source/common/servlkf.cpp",
+      "../externals/icu/source/common/servloc.h",
       "../externals/icu/source/common/servls.cpp",
       "../externals/icu/source/common/servnotf.cpp",
+      "../externals/icu/source/common/servnotf.h",
       "../externals/icu/source/common/servrbf.cpp",
       "../externals/icu/source/common/servslkf.cpp",
       "../externals/icu/source/common/sharedobject.cpp",
-      "../externals/icu/source/common/simplepatternformatter.cpp",
+      "../externals/icu/source/common/sharedobject.h",
+      "../externals/icu/source/common/simpleformatter.cpp",
+      "../externals/icu/source/common/sprpimpl.h",
+      "../externals/icu/source/common/static_unicode_sets.cpp",
+      "../externals/icu/source/common/static_unicode_sets.h",
       "../externals/icu/source/common/stringpiece.cpp",
       "../externals/icu/source/common/stringtriebuilder.cpp",
-      "../externals/icu/source/common/uarrsort.c",
-      "../externals/icu/source/common/ubidi.c",
-      "../externals/icu/source/common/ubidi_props.c",
-      "../externals/icu/source/common/ubidiln.c",
-      "../externals/icu/source/common/ubidiwrt.c",
+      "../externals/icu/source/common/uarrsort.cpp",
+      "../externals/icu/source/common/uarrsort.h",
+      "../externals/icu/source/common/uassert.h",
+      "../externals/icu/source/common/ubidi.cpp",
+      "../externals/icu/source/common/ubidi_props.cpp",
+      "../externals/icu/source/common/ubidi_props.h",
+      "../externals/icu/source/common/ubidi_props_data.h",
+      "../externals/icu/source/common/ubidiimp.h",
+      "../externals/icu/source/common/ubidiln.cpp",
+      "../externals/icu/source/common/ubiditransform.cpp",
+      "../externals/icu/source/common/ubidiwrt.cpp",
       "../externals/icu/source/common/ubrk.cpp",
+      "../externals/icu/source/common/ubrkimpl.h",
       "../externals/icu/source/common/ucase.cpp",
+      "../externals/icu/source/common/ucase.h",
+      "../externals/icu/source/common/ucase_props_data.h",
       "../externals/icu/source/common/ucasemap.cpp",
+      "../externals/icu/source/common/ucasemap_imp.h",
       "../externals/icu/source/common/ucasemap_titlecase_brkiter.cpp",
-      "../externals/icu/source/common/ucat.c",
-      "../externals/icu/source/common/uchar.c",
+      "../externals/icu/source/common/ucat.cpp",
+      "../externals/icu/source/common/uchar.cpp",
+      "../externals/icu/source/common/uchar_props_data.h",
       "../externals/icu/source/common/ucharstrie.cpp",
       "../externals/icu/source/common/ucharstriebuilder.cpp",
       "../externals/icu/source/common/ucharstrieiterator.cpp",
       "../externals/icu/source/common/uchriter.cpp",
+      "../externals/icu/source/common/ucln.h",
       "../externals/icu/source/common/ucln_cmn.cpp",
-      "../externals/icu/source/common/ucmndata.c",
-      "../externals/icu/source/common/ucnv.c",
+      "../externals/icu/source/common/ucln_cmn.h",
+      "../externals/icu/source/common/ucln_imp.h",
+      "../externals/icu/source/common/ucmndata.cpp",
+      "../externals/icu/source/common/ucmndata.h",
+      "../externals/icu/source/common/ucnv.cpp",
       "../externals/icu/source/common/ucnv2022.cpp",
       "../externals/icu/source/common/ucnv_bld.cpp",
-      "../externals/icu/source/common/ucnv_cb.c",
-      "../externals/icu/source/common/ucnv_cnv.c",
-      "../externals/icu/source/common/ucnv_ct.c",
-      "../externals/icu/source/common/ucnv_err.c",
+      "../externals/icu/source/common/ucnv_bld.h",
+      "../externals/icu/source/common/ucnv_cb.cpp",
+      "../externals/icu/source/common/ucnv_cnv.cpp",
+      "../externals/icu/source/common/ucnv_cnv.h",
+      "../externals/icu/source/common/ucnv_ct.cpp",
+      "../externals/icu/source/common/ucnv_err.cpp",
       "../externals/icu/source/common/ucnv_ext.cpp",
+      "../externals/icu/source/common/ucnv_ext.h",
+      "../externals/icu/source/common/ucnv_imp.h",
       "../externals/icu/source/common/ucnv_io.cpp",
-      "../externals/icu/source/common/ucnv_lmb.c",
-      "../externals/icu/source/common/ucnv_set.c",
-      "../externals/icu/source/common/ucnv_u16.c",
-      "../externals/icu/source/common/ucnv_u32.c",
-      "../externals/icu/source/common/ucnv_u7.c",
-      "../externals/icu/source/common/ucnv_u8.c",
+      "../externals/icu/source/common/ucnv_io.h",
+      "../externals/icu/source/common/ucnv_lmb.cpp",
+      "../externals/icu/source/common/ucnv_set.cpp",
+      "../externals/icu/source/common/ucnv_u16.cpp",
+      "../externals/icu/source/common/ucnv_u32.cpp",
+      "../externals/icu/source/common/ucnv_u7.cpp",
+      "../externals/icu/source/common/ucnv_u8.cpp",
       "../externals/icu/source/common/ucnvbocu.cpp",
-      "../externals/icu/source/common/ucnvdisp.c",
-      "../externals/icu/source/common/ucnvhz.c",
-      "../externals/icu/source/common/ucnvisci.c",
-      "../externals/icu/source/common/ucnvlat1.c",
+      "../externals/icu/source/common/ucnvdisp.cpp",
+      "../externals/icu/source/common/ucnvhz.cpp",
+      "../externals/icu/source/common/ucnvisci.cpp",
+      "../externals/icu/source/common/ucnvlat1.cpp",
       "../externals/icu/source/common/ucnvmbcs.cpp",
-      "../externals/icu/source/common/ucnvscsu.c",
+      "../externals/icu/source/common/ucnvmbcs.h",
+      "../externals/icu/source/common/ucnvscsu.cpp",
       "../externals/icu/source/common/ucnvsel.cpp",
+      "../externals/icu/source/common/ucol_data.h",
       "../externals/icu/source/common/ucol_swp.cpp",
+      "../externals/icu/source/common/ucol_swp.h",
+      "../externals/icu/source/common/ucptrie.cpp",
+      "../externals/icu/source/common/ucptrie_impl.h",
+      "../externals/icu/source/common/ucurr.cpp",
+      "../externals/icu/source/common/ucurrimp.h",
       "../externals/icu/source/common/udata.cpp",
-      "../externals/icu/source/common/udatamem.c",
-      "../externals/icu/source/common/udataswp.c",
-      "../externals/icu/source/common/uenum.c",
-      "../externals/icu/source/common/uhash.c",
+      "../externals/icu/source/common/udatamem.cpp",
+      "../externals/icu/source/common/udatamem.h",
+      "../externals/icu/source/common/udataswp.cpp",
+      "../externals/icu/source/common/udataswp.h",
+      "../externals/icu/source/common/uelement.h",
+      "../externals/icu/source/common/uenum.cpp",
+      "../externals/icu/source/common/uenumimp.h",
+      "../externals/icu/source/common/uhash.cpp",
+      "../externals/icu/source/common/uhash.h",
       "../externals/icu/source/common/uhash_us.cpp",
       "../externals/icu/source/common/uidna.cpp",
       "../externals/icu/source/common/uinit.cpp",
-      "../externals/icu/source/common/uinvchar.c",
+      "../externals/icu/source/common/uinvchar.cpp",
+      "../externals/icu/source/common/uinvchar.h",
       "../externals/icu/source/common/uiter.cpp",
-      "../externals/icu/source/common/ulist.c",
-      "../externals/icu/source/common/ulistformatter.cpp",
+      "../externals/icu/source/common/ulayout_props_data.h",
+      "../externals/icu/source/common/ulist.cpp",
+      "../externals/icu/source/common/ulist.h",
       "../externals/icu/source/common/uloc.cpp",
       "../externals/icu/source/common/uloc_keytype.cpp",
-      "../externals/icu/source/common/uloc_tag.c",
-      "../externals/icu/source/common/umapfile.c",
-      "../externals/icu/source/common/umath.c",
+      "../externals/icu/source/common/uloc_tag.cpp",
+      "../externals/icu/source/common/ulocimp.h",
+      "../externals/icu/source/common/umapfile.cpp",
+      "../externals/icu/source/common/umapfile.h",
+      "../externals/icu/source/common/umath.cpp",
+      "../externals/icu/source/common/umutablecptrie.cpp",
       "../externals/icu/source/common/umutex.cpp",
+      "../externals/icu/source/common/umutex.h",
       "../externals/icu/source/common/unames.cpp",
       "../externals/icu/source/common/unifiedcache.cpp",
+      "../externals/icu/source/common/unifiedcache.h",
       "../externals/icu/source/common/unifilt.cpp",
       "../externals/icu/source/common/unifunct.cpp",
       "../externals/icu/source/common/uniset.cpp",
       "../externals/icu/source/common/uniset_closure.cpp",
       "../externals/icu/source/common/uniset_props.cpp",
       "../externals/icu/source/common/unisetspan.cpp",
+      "../externals/icu/source/common/unisetspan.h",
       "../externals/icu/source/common/unistr.cpp",
       "../externals/icu/source/common/unistr_case.cpp",
       "../externals/icu/source/common/unistr_case_locale.cpp",
       "../externals/icu/source/common/unistr_cnv.cpp",
       "../externals/icu/source/common/unistr_props.cpp",
       "../externals/icu/source/common/unistr_titlecase_brkiter.cpp",
+      "../externals/icu/source/common/unistrappender.h",
       "../externals/icu/source/common/unorm.cpp",
       "../externals/icu/source/common/unormcmp.cpp",
+      "../externals/icu/source/common/unormimp.h",
       "../externals/icu/source/common/uobject.cpp",
+      "../externals/icu/source/common/uposixdefs.h",
       "../externals/icu/source/common/uprops.cpp",
-      "../externals/icu/source/common/ures_cnv.c",
+      "../externals/icu/source/common/uprops.h",
+      "../externals/icu/source/common/ures_cnv.cpp",
       "../externals/icu/source/common/uresbund.cpp",
       "../externals/icu/source/common/uresdata.cpp",
-      "../externals/icu/source/common/uresource.cpp",
-      "../externals/icu/source/common/usc_impl.c",
-      "../externals/icu/source/common/uscript.c",
+      "../externals/icu/source/common/uresdata.h",
+      "../externals/icu/source/common/uresimp.h",
+      "../externals/icu/source/common/ureslocs.h",
+      "../externals/icu/source/common/usc_impl.cpp",
+      "../externals/icu/source/common/usc_impl.h",
+      "../externals/icu/source/common/uscript.cpp",
       "../externals/icu/source/common/uscript_props.cpp",
       "../externals/icu/source/common/uset.cpp",
+      "../externals/icu/source/common/uset_imp.h",
       "../externals/icu/source/common/uset_props.cpp",
       "../externals/icu/source/common/usetiter.cpp",
       "../externals/icu/source/common/ushape.cpp",
       "../externals/icu/source/common/usprep.cpp",
       "../externals/icu/source/common/ustack.cpp",
       "../externals/icu/source/common/ustr_cnv.cpp",
+      "../externals/icu/source/common/ustr_cnv.h",
+      "../externals/icu/source/common/ustr_imp.h",
       "../externals/icu/source/common/ustr_titlecase_brkiter.cpp",
       "../externals/icu/source/common/ustr_wcs.cpp",
       "../externals/icu/source/common/ustrcase.cpp",
       "../externals/icu/source/common/ustrcase_locale.cpp",
       "../externals/icu/source/common/ustrenum.cpp",
-      "../externals/icu/source/common/ustrfmt.c",
+      "../externals/icu/source/common/ustrenum.h",
+      "../externals/icu/source/common/ustrfmt.cpp",
+      "../externals/icu/source/common/ustrfmt.h",
       "../externals/icu/source/common/ustring.cpp",
       "../externals/icu/source/common/ustrtrns.cpp",
       "../externals/icu/source/common/utext.cpp",
-      "../externals/icu/source/common/utf_impl.c",
+      "../externals/icu/source/common/utf_impl.cpp",
       "../externals/icu/source/common/util.cpp",
+      "../externals/icu/source/common/util.h",
       "../externals/icu/source/common/util_props.cpp",
-      "../externals/icu/source/common/utrace.c",
+      "../externals/icu/source/common/utrace.cpp",
+      "../externals/icu/source/common/utracimp.h",
       "../externals/icu/source/common/utrie.cpp",
+      "../externals/icu/source/common/utrie.h",
       "../externals/icu/source/common/utrie2.cpp",
+      "../externals/icu/source/common/utrie2.h",
       "../externals/icu/source/common/utrie2_builder.cpp",
+      "../externals/icu/source/common/utrie2_impl.h",
+      "../externals/icu/source/common/utrie_swap.cpp",
       "../externals/icu/source/common/uts46.cpp",
-      "../externals/icu/source/common/utypes.c",
+      "../externals/icu/source/common/utypeinfo.h",
+      "../externals/icu/source/common/utypes.cpp",
       "../externals/icu/source/common/uvector.cpp",
+      "../externals/icu/source/common/uvector.h",
       "../externals/icu/source/common/uvectr32.cpp",
+      "../externals/icu/source/common/uvectr32.h",
       "../externals/icu/source/common/uvectr64.cpp",
-      "../externals/icu/source/common/wintz.c",
+      "../externals/icu/source/common/uvectr64.h",
+      "../externals/icu/source/common/wintz.cpp",
+      "../externals/icu/source/common/wintz.h",
+      "../externals/icu/source/i18n/alphaindex.cpp",
+      "../externals/icu/source/i18n/anytrans.cpp",
+      "../externals/icu/source/i18n/anytrans.h",
+      "../externals/icu/source/i18n/astro.cpp",
+      "../externals/icu/source/i18n/astro.h",
+      "../externals/icu/source/i18n/basictz.cpp",
+      "../externals/icu/source/i18n/bocsu.cpp",
+      "../externals/icu/source/i18n/bocsu.h",
+      "../externals/icu/source/i18n/brktrans.cpp",
+      "../externals/icu/source/i18n/brktrans.h",
+      "../externals/icu/source/i18n/buddhcal.cpp",
+      "../externals/icu/source/i18n/buddhcal.h",
+      "../externals/icu/source/i18n/calendar.cpp",
+      "../externals/icu/source/i18n/casetrn.cpp",
+      "../externals/icu/source/i18n/casetrn.h",
+      "../externals/icu/source/i18n/cecal.cpp",
+      "../externals/icu/source/i18n/cecal.h",
+      "../externals/icu/source/i18n/chnsecal.cpp",
+      "../externals/icu/source/i18n/chnsecal.h",
+      "../externals/icu/source/i18n/choicfmt.cpp",
+      "../externals/icu/source/i18n/coleitr.cpp",
+      "../externals/icu/source/i18n/coll.cpp",
+      "../externals/icu/source/i18n/collation.cpp",
+      "../externals/icu/source/i18n/collation.h",
+      "../externals/icu/source/i18n/collationbuilder.cpp",
+      "../externals/icu/source/i18n/collationbuilder.h",
+      "../externals/icu/source/i18n/collationcompare.cpp",
+      "../externals/icu/source/i18n/collationcompare.h",
+      "../externals/icu/source/i18n/collationdata.cpp",
+      "../externals/icu/source/i18n/collationdata.h",
+      "../externals/icu/source/i18n/collationdatabuilder.cpp",
+      "../externals/icu/source/i18n/collationdatabuilder.h",
+      "../externals/icu/source/i18n/collationdatareader.cpp",
+      "../externals/icu/source/i18n/collationdatareader.h",
+      "../externals/icu/source/i18n/collationdatawriter.cpp",
+      "../externals/icu/source/i18n/collationdatawriter.h",
+      "../externals/icu/source/i18n/collationfastlatin.cpp",
+      "../externals/icu/source/i18n/collationfastlatin.h",
+      "../externals/icu/source/i18n/collationfastlatinbuilder.cpp",
+      "../externals/icu/source/i18n/collationfastlatinbuilder.h",
+      "../externals/icu/source/i18n/collationfcd.cpp",
+      "../externals/icu/source/i18n/collationfcd.h",
+      "../externals/icu/source/i18n/collationiterator.cpp",
+      "../externals/icu/source/i18n/collationiterator.h",
+      "../externals/icu/source/i18n/collationkeys.cpp",
+      "../externals/icu/source/i18n/collationkeys.h",
+      "../externals/icu/source/i18n/collationroot.cpp",
+      "../externals/icu/source/i18n/collationroot.h",
+      "../externals/icu/source/i18n/collationrootelements.cpp",
+      "../externals/icu/source/i18n/collationrootelements.h",
+      "../externals/icu/source/i18n/collationruleparser.cpp",
+      "../externals/icu/source/i18n/collationruleparser.h",
+      "../externals/icu/source/i18n/collationsets.cpp",
+      "../externals/icu/source/i18n/collationsets.h",
+      "../externals/icu/source/i18n/collationsettings.cpp",
+      "../externals/icu/source/i18n/collationsettings.h",
+      "../externals/icu/source/i18n/collationtailoring.cpp",
+      "../externals/icu/source/i18n/collationtailoring.h",
+      "../externals/icu/source/i18n/collationweights.cpp",
+      "../externals/icu/source/i18n/collationweights.h",
+      "../externals/icu/source/i18n/collunsafe.h",
+      "../externals/icu/source/i18n/compactdecimalformat.cpp",
+      "../externals/icu/source/i18n/coptccal.cpp",
+      "../externals/icu/source/i18n/coptccal.h",
+      "../externals/icu/source/i18n/cpdtrans.cpp",
+      "../externals/icu/source/i18n/cpdtrans.h",
+      "../externals/icu/source/i18n/csdetect.cpp",
+      "../externals/icu/source/i18n/csdetect.h",
+      "../externals/icu/source/i18n/csmatch.cpp",
+      "../externals/icu/source/i18n/csmatch.h",
+      "../externals/icu/source/i18n/csr2022.cpp",
+      "../externals/icu/source/i18n/csr2022.h",
+      "../externals/icu/source/i18n/csrecog.cpp",
+      "../externals/icu/source/i18n/csrecog.h",
+      "../externals/icu/source/i18n/csrmbcs.cpp",
+      "../externals/icu/source/i18n/csrmbcs.h",
+      "../externals/icu/source/i18n/csrsbcs.cpp",
+      "../externals/icu/source/i18n/csrsbcs.h",
+      "../externals/icu/source/i18n/csrucode.cpp",
+      "../externals/icu/source/i18n/csrucode.h",
+      "../externals/icu/source/i18n/csrutf8.cpp",
+      "../externals/icu/source/i18n/csrutf8.h",
+      "../externals/icu/source/i18n/curramt.cpp",
+      "../externals/icu/source/i18n/currfmt.cpp",
+      "../externals/icu/source/i18n/currfmt.h",
+      "../externals/icu/source/i18n/currpinf.cpp",
+      "../externals/icu/source/i18n/currunit.cpp",
+      "../externals/icu/source/i18n/dangical.cpp",
+      "../externals/icu/source/i18n/dangical.h",
+      "../externals/icu/source/i18n/datefmt.cpp",
+      "../externals/icu/source/i18n/dayperiodrules.cpp",
+      "../externals/icu/source/i18n/dayperiodrules.h",
+      "../externals/icu/source/i18n/dcfmtsym.cpp",
+      "../externals/icu/source/i18n/decContext.cpp",
+      "../externals/icu/source/i18n/decContext.h",
+      "../externals/icu/source/i18n/decNumber.cpp",
+      "../externals/icu/source/i18n/decNumber.h",
+      "../externals/icu/source/i18n/decNumberLocal.h",
+      "../externals/icu/source/i18n/decimfmt.cpp",
+      "../externals/icu/source/i18n/double-conversion-bignum-dtoa.cpp",
+      "../externals/icu/source/i18n/double-conversion-bignum-dtoa.h",
+      "../externals/icu/source/i18n/double-conversion-bignum.cpp",
+      "../externals/icu/source/i18n/double-conversion-bignum.h",
+      "../externals/icu/source/i18n/double-conversion-cached-powers.cpp",
+      "../externals/icu/source/i18n/double-conversion-cached-powers.h",
+      "../externals/icu/source/i18n/double-conversion-diy-fp.cpp",
+      "../externals/icu/source/i18n/double-conversion-diy-fp.h",
+      "../externals/icu/source/i18n/double-conversion-fast-dtoa.cpp",
+      "../externals/icu/source/i18n/double-conversion-fast-dtoa.h",
+      "../externals/icu/source/i18n/double-conversion-ieee.h",
+      "../externals/icu/source/i18n/double-conversion-strtod.cpp",
+      "../externals/icu/source/i18n/double-conversion-strtod.h",
+      "../externals/icu/source/i18n/double-conversion-utils.h",
+      "../externals/icu/source/i18n/double-conversion.cpp",
+      "../externals/icu/source/i18n/double-conversion.h",
+      "../externals/icu/source/i18n/dt_impl.h",
+      "../externals/icu/source/i18n/dtfmtsym.cpp",
+      "../externals/icu/source/i18n/dtitv_impl.h",
+      "../externals/icu/source/i18n/dtitvfmt.cpp",
+      "../externals/icu/source/i18n/dtitvinf.cpp",
+      "../externals/icu/source/i18n/dtptngen.cpp",
+      "../externals/icu/source/i18n/dtptngen_impl.h",
+      "../externals/icu/source/i18n/dtrule.cpp",
+      "../externals/icu/source/i18n/erarules.cpp",
+      "../externals/icu/source/i18n/erarules.h",
+      "../externals/icu/source/i18n/esctrn.cpp",
+      "../externals/icu/source/i18n/esctrn.h",
+      "../externals/icu/source/i18n/ethpccal.cpp",
+      "../externals/icu/source/i18n/ethpccal.h",
+      "../externals/icu/source/i18n/fmtable.cpp",
+      "../externals/icu/source/i18n/fmtable_cnv.cpp",
+      "../externals/icu/source/i18n/fmtableimp.h",
+      "../externals/icu/source/i18n/format.cpp",
+      "../externals/icu/source/i18n/fphdlimp.cpp",
+      "../externals/icu/source/i18n/fphdlimp.h",
+      "../externals/icu/source/i18n/fpositer.cpp",
+      "../externals/icu/source/i18n/funcrepl.cpp",
+      "../externals/icu/source/i18n/funcrepl.h",
+      "../externals/icu/source/i18n/gender.cpp",
+      "../externals/icu/source/i18n/gregocal.cpp",
+      "../externals/icu/source/i18n/gregoimp.cpp",
+      "../externals/icu/source/i18n/gregoimp.h",
+      "../externals/icu/source/i18n/hebrwcal.cpp",
+      "../externals/icu/source/i18n/hebrwcal.h",
+      "../externals/icu/source/i18n/indiancal.cpp",
+      "../externals/icu/source/i18n/indiancal.h",
+      "../externals/icu/source/i18n/inputext.cpp",
+      "../externals/icu/source/i18n/inputext.h",
+      "../externals/icu/source/i18n/islamcal.cpp",
+      "../externals/icu/source/i18n/islamcal.h",
+      "../externals/icu/source/i18n/japancal.cpp",
+      "../externals/icu/source/i18n/japancal.h",
+      "../externals/icu/source/i18n/listformatter.cpp",
+      "../externals/icu/source/i18n/measfmt.cpp",
+      "../externals/icu/source/i18n/measunit.cpp",
+      "../externals/icu/source/i18n/measure.cpp",
+      "../externals/icu/source/i18n/msgfmt.cpp",
+      "../externals/icu/source/i18n/msgfmt_impl.h",
+      "../externals/icu/source/i18n/name2uni.cpp",
+      "../externals/icu/source/i18n/name2uni.h",
+      "../externals/icu/source/i18n/nfrlist.h",
+      "../externals/icu/source/i18n/nfrs.cpp",
+      "../externals/icu/source/i18n/nfrs.h",
+      "../externals/icu/source/i18n/nfrule.cpp",
+      "../externals/icu/source/i18n/nfrule.h",
+      "../externals/icu/source/i18n/nfsubs.cpp",
+      "../externals/icu/source/i18n/nfsubs.h",
+      "../externals/icu/source/i18n/nortrans.cpp",
+      "../externals/icu/source/i18n/nortrans.h",
+      "../externals/icu/source/i18n/nounit.cpp",
+      "../externals/icu/source/i18n/nultrans.cpp",
+      "../externals/icu/source/i18n/nultrans.h",
+      "../externals/icu/source/i18n/number_affixutils.cpp",
+      "../externals/icu/source/i18n/number_affixutils.h",
+      "../externals/icu/source/i18n/number_asformat.cpp",
+      "../externals/icu/source/i18n/number_asformat.h",
+      "../externals/icu/source/i18n/number_capi.cpp",
+      "../externals/icu/source/i18n/number_compact.cpp",
+      "../externals/icu/source/i18n/number_compact.h",
+      "../externals/icu/source/i18n/number_currencysymbols.cpp",
+      "../externals/icu/source/i18n/number_currencysymbols.h",
+      "../externals/icu/source/i18n/number_decimalquantity.cpp",
+      "../externals/icu/source/i18n/number_decimalquantity.h",
+      "../externals/icu/source/i18n/number_decimfmtprops.cpp",
+      "../externals/icu/source/i18n/number_decimfmtprops.h",
+      "../externals/icu/source/i18n/number_decnum.h",
+      "../externals/icu/source/i18n/number_fluent.cpp",
+      "../externals/icu/source/i18n/number_formatimpl.cpp",
+      "../externals/icu/source/i18n/number_formatimpl.h",
+      "../externals/icu/source/i18n/number_grouping.cpp",
+      "../externals/icu/source/i18n/number_integerwidth.cpp",
+      "../externals/icu/source/i18n/number_longnames.cpp",
+      "../externals/icu/source/i18n/number_longnames.h",
+      "../externals/icu/source/i18n/number_mapper.cpp",
+      "../externals/icu/source/i18n/number_mapper.h",
+      "../externals/icu/source/i18n/number_microprops.h",
+      "../externals/icu/source/i18n/number_modifiers.cpp",
+      "../externals/icu/source/i18n/number_modifiers.h",
+      "../externals/icu/source/i18n/number_multiplier.cpp",
+      "../externals/icu/source/i18n/number_multiplier.h",
+      "../externals/icu/source/i18n/number_notation.cpp",
+      "../externals/icu/source/i18n/number_padding.cpp",
+      "../externals/icu/source/i18n/number_patternmodifier.cpp",
+      "../externals/icu/source/i18n/number_patternmodifier.h",
+      "../externals/icu/source/i18n/number_patternstring.cpp",
+      "../externals/icu/source/i18n/number_patternstring.h",
+      "../externals/icu/source/i18n/number_rounding.cpp",
+      "../externals/icu/source/i18n/number_roundingutils.h",
+      "../externals/icu/source/i18n/number_scientific.cpp",
+      "../externals/icu/source/i18n/number_scientific.h",
+      "../externals/icu/source/i18n/number_skeletons.cpp",
+      "../externals/icu/source/i18n/number_skeletons.h",
+      "../externals/icu/source/i18n/number_stringbuilder.cpp",
+      "../externals/icu/source/i18n/number_stringbuilder.h",
+      "../externals/icu/source/i18n/number_types.h",
+      "../externals/icu/source/i18n/number_utils.cpp",
+      "../externals/icu/source/i18n/number_utils.h",
+      "../externals/icu/source/i18n/number_utypes.h",
+      "../externals/icu/source/i18n/numfmt.cpp",
+      "../externals/icu/source/i18n/numparse_affixes.cpp",
+      "../externals/icu/source/i18n/numparse_affixes.h",
+      "../externals/icu/source/i18n/numparse_compositions.cpp",
+      "../externals/icu/source/i18n/numparse_compositions.h",
+      "../externals/icu/source/i18n/numparse_currency.cpp",
+      "../externals/icu/source/i18n/numparse_currency.h",
+      "../externals/icu/source/i18n/numparse_decimal.cpp",
+      "../externals/icu/source/i18n/numparse_decimal.h",
+      "../externals/icu/source/i18n/numparse_impl.cpp",
+      "../externals/icu/source/i18n/numparse_impl.h",
+      "../externals/icu/source/i18n/numparse_parsednumber.cpp",
+      "../externals/icu/source/i18n/numparse_scientific.cpp",
+      "../externals/icu/source/i18n/numparse_scientific.h",
+      "../externals/icu/source/i18n/numparse_stringsegment.cpp",
+      "../externals/icu/source/i18n/numparse_stringsegment.h",
+      "../externals/icu/source/i18n/numparse_symbols.cpp",
+      "../externals/icu/source/i18n/numparse_symbols.h",
+      "../externals/icu/source/i18n/numparse_types.h",
+      "../externals/icu/source/i18n/numparse_utils.h",
+      "../externals/icu/source/i18n/numparse_validators.cpp",
+      "../externals/icu/source/i18n/numparse_validators.h",
+      "../externals/icu/source/i18n/numrange_fluent.cpp",
+      "../externals/icu/source/i18n/numrange_impl.cpp",
+      "../externals/icu/source/i18n/numrange_impl.h",
+      "../externals/icu/source/i18n/numsys.cpp",
+      "../externals/icu/source/i18n/numsys_impl.h",
+      "../externals/icu/source/i18n/olsontz.cpp",
+      "../externals/icu/source/i18n/olsontz.h",
+      "../externals/icu/source/i18n/persncal.cpp",
+      "../externals/icu/source/i18n/persncal.h",
+      "../externals/icu/source/i18n/plurfmt.cpp",
+      "../externals/icu/source/i18n/plurrule.cpp",
+      "../externals/icu/source/i18n/plurrule_impl.h",
+      "../externals/icu/source/i18n/quant.cpp",
+      "../externals/icu/source/i18n/quant.h",
+      "../externals/icu/source/i18n/quantityformatter.cpp",
+      "../externals/icu/source/i18n/quantityformatter.h",
+      "../externals/icu/source/i18n/rbnf.cpp",
+      "../externals/icu/source/i18n/rbt.cpp",
+      "../externals/icu/source/i18n/rbt.h",
+      "../externals/icu/source/i18n/rbt_data.cpp",
+      "../externals/icu/source/i18n/rbt_data.h",
+      "../externals/icu/source/i18n/rbt_pars.cpp",
+      "../externals/icu/source/i18n/rbt_pars.h",
+      "../externals/icu/source/i18n/rbt_rule.cpp",
+      "../externals/icu/source/i18n/rbt_rule.h",
+      "../externals/icu/source/i18n/rbt_set.cpp",
+      "../externals/icu/source/i18n/rbt_set.h",
+      "../externals/icu/source/i18n/rbtz.cpp",
+      "../externals/icu/source/i18n/regexcmp.cpp",
+      "../externals/icu/source/i18n/regexcmp.h",
+      "../externals/icu/source/i18n/regexcst.h",
+      "../externals/icu/source/i18n/regeximp.cpp",
+      "../externals/icu/source/i18n/regeximp.h",
+      "../externals/icu/source/i18n/regexst.cpp",
+      "../externals/icu/source/i18n/regexst.h",
+      "../externals/icu/source/i18n/regextxt.cpp",
+      "../externals/icu/source/i18n/regextxt.h",
+      "../externals/icu/source/i18n/region.cpp",
+      "../externals/icu/source/i18n/region_impl.h",
+      "../externals/icu/source/i18n/reldatefmt.cpp",
+      "../externals/icu/source/i18n/reldtfmt.cpp",
+      "../externals/icu/source/i18n/reldtfmt.h",
+      "../externals/icu/source/i18n/rematch.cpp",
+      "../externals/icu/source/i18n/remtrans.cpp",
+      "../externals/icu/source/i18n/remtrans.h",
+      "../externals/icu/source/i18n/repattrn.cpp",
+      "../externals/icu/source/i18n/rulebasedcollator.cpp",
+      "../externals/icu/source/i18n/scientificnumberformatter.cpp",
+      "../externals/icu/source/i18n/scriptset.cpp",
+      "../externals/icu/source/i18n/scriptset.h",
+      "../externals/icu/source/i18n/search.cpp",
+      "../externals/icu/source/i18n/selfmt.cpp",
+      "../externals/icu/source/i18n/selfmtimpl.h",
+      "../externals/icu/source/i18n/sharedbreakiterator.cpp",
+      "../externals/icu/source/i18n/sharedbreakiterator.h",
+      "../externals/icu/source/i18n/sharedcalendar.h",
+      "../externals/icu/source/i18n/shareddateformatsymbols.h",
+      "../externals/icu/source/i18n/sharednumberformat.h",
+      "../externals/icu/source/i18n/sharedpluralrules.h",
+      "../externals/icu/source/i18n/simpletz.cpp",
+      "../externals/icu/source/i18n/smpdtfmt.cpp",
+      "../externals/icu/source/i18n/smpdtfst.cpp",
+      "../externals/icu/source/i18n/smpdtfst.h",
+      "../externals/icu/source/i18n/sortkey.cpp",
+      "../externals/icu/source/i18n/standardplural.cpp",
+      "../externals/icu/source/i18n/standardplural.h",
+      "../externals/icu/source/i18n/strmatch.cpp",
+      "../externals/icu/source/i18n/strmatch.h",
+      "../externals/icu/source/i18n/strrepl.cpp",
+      "../externals/icu/source/i18n/strrepl.h",
+      "../externals/icu/source/i18n/stsearch.cpp",
+      "../externals/icu/source/i18n/taiwncal.cpp",
+      "../externals/icu/source/i18n/taiwncal.h",
+      "../externals/icu/source/i18n/timezone.cpp",
+      "../externals/icu/source/i18n/titletrn.cpp",
+      "../externals/icu/source/i18n/titletrn.h",
+      "../externals/icu/source/i18n/tmunit.cpp",
+      "../externals/icu/source/i18n/tmutamt.cpp",
+      "../externals/icu/source/i18n/tmutfmt.cpp",
+      "../externals/icu/source/i18n/tolowtrn.cpp",
+      "../externals/icu/source/i18n/tolowtrn.h",
+      "../externals/icu/source/i18n/toupptrn.cpp",
+      "../externals/icu/source/i18n/toupptrn.h",
+      "../externals/icu/source/i18n/translit.cpp",
+      "../externals/icu/source/i18n/transreg.cpp",
+      "../externals/icu/source/i18n/transreg.h",
+      "../externals/icu/source/i18n/tridpars.cpp",
+      "../externals/icu/source/i18n/tridpars.h",
+      "../externals/icu/source/i18n/tzfmt.cpp",
+      "../externals/icu/source/i18n/tzgnames.cpp",
+      "../externals/icu/source/i18n/tzgnames.h",
+      "../externals/icu/source/i18n/tznames.cpp",
+      "../externals/icu/source/i18n/tznames_impl.cpp",
+      "../externals/icu/source/i18n/tznames_impl.h",
+      "../externals/icu/source/i18n/tzrule.cpp",
+      "../externals/icu/source/i18n/tztrans.cpp",
+      "../externals/icu/source/i18n/ucal.cpp",
+      "../externals/icu/source/i18n/ucln_in.cpp",
+      "../externals/icu/source/i18n/ucln_in.h",
+      "../externals/icu/source/i18n/ucol.cpp",
+      "../externals/icu/source/i18n/ucol_imp.h",
+      "../externals/icu/source/i18n/ucol_res.cpp",
+      "../externals/icu/source/i18n/ucol_sit.cpp",
+      "../externals/icu/source/i18n/ucoleitr.cpp",
+      "../externals/icu/source/i18n/ucsdet.cpp",
+      "../externals/icu/source/i18n/udat.cpp",
+      "../externals/icu/source/i18n/udateintervalformat.cpp",
+      "../externals/icu/source/i18n/udatpg.cpp",
+      "../externals/icu/source/i18n/ufieldpositer.cpp",
+      "../externals/icu/source/i18n/uitercollationiterator.cpp",
+      "../externals/icu/source/i18n/uitercollationiterator.h",
+      "../externals/icu/source/i18n/ulistformatter.cpp",
+      "../externals/icu/source/i18n/ulocdata.cpp",
+      "../externals/icu/source/i18n/umsg.cpp",
+      "../externals/icu/source/i18n/umsg_imp.h",
+      "../externals/icu/source/i18n/unesctrn.cpp",
+      "../externals/icu/source/i18n/unesctrn.h",
+      "../externals/icu/source/i18n/uni2name.cpp",
+      "../externals/icu/source/i18n/uni2name.h",
+      "../externals/icu/source/i18n/unum.cpp",
+      "../externals/icu/source/i18n/unumsys.cpp",
+      "../externals/icu/source/i18n/upluralrules.cpp",
+      "../externals/icu/source/i18n/uregex.cpp",
+      "../externals/icu/source/i18n/uregexc.cpp",
+      "../externals/icu/source/i18n/uregion.cpp",
+      "../externals/icu/source/i18n/usearch.cpp",
+      "../externals/icu/source/i18n/uspoof.cpp",
+      "../externals/icu/source/i18n/uspoof_build.cpp",
+      "../externals/icu/source/i18n/uspoof_conf.cpp",
+      "../externals/icu/source/i18n/uspoof_conf.h",
+      "../externals/icu/source/i18n/uspoof_impl.cpp",
+      "../externals/icu/source/i18n/uspoof_impl.h",
+      "../externals/icu/source/i18n/usrchimp.h",
+      "../externals/icu/source/i18n/utf16collationiterator.cpp",
+      "../externals/icu/source/i18n/utf16collationiterator.h",
+      "../externals/icu/source/i18n/utf8collationiterator.cpp",
+      "../externals/icu/source/i18n/utf8collationiterator.h",
+      "../externals/icu/source/i18n/utmscale.cpp",
+      "../externals/icu/source/i18n/utrans.cpp",
+      "../externals/icu/source/i18n/vtzone.cpp",
+      "../externals/icu/source/i18n/vzone.cpp",
+      "../externals/icu/source/i18n/vzone.h",
+      "../externals/icu/source/i18n/windtfmt.cpp",
+      "../externals/icu/source/i18n/windtfmt.h",
+      "../externals/icu/source/i18n/winnmfmt.cpp",
+      "../externals/icu/source/i18n/winnmfmt.h",
+      "../externals/icu/source/i18n/wintzimpl.cpp",
+      "../externals/icu/source/i18n/wintzimpl.h",
+      "../externals/icu/source/i18n/zonemeta.cpp",
+      "../externals/icu/source/i18n/zonemeta.h",
+      "../externals/icu/source/i18n/zrule.cpp",
+      "../externals/icu/source/i18n/zrule.h",
+      "../externals/icu/source/i18n/ztrans.cpp",
+      "../externals/icu/source/i18n/ztrans.h",
     ]
     if (is_win) {
       deps = [
@@ -219,14 +756,12 @@ if (skia_use_system_icu) {
         "U_STATIC_IMPLEMENTATION",
       ]
       libs = [ "Advapi32.lib" ]
-      sources += [ "../externals/icu/source/stubdata/stubdata.c" ]
+      sources += [ "../externals/icu/source/stubdata/stubdata.cpp" ]
     } else {
-      if (is_ios) {
-        sources += [ "../externals/icu/mac/icudtl_dat.S" ]
-      } else {
-        sources += [ "../externals/icu/$current_os/icudtl_dat.S" ]
-      }
-      libs = [ "dl" ]
+      sources += [ "$data_assembly" ]
+      deps = [
+        ":make_data_assembly",
+      ]
     }
   }
   if (is_win) {