ICU update to 54 - step 4

patches/data.build.patch

 diff --git a/source/data/Makefile.in b/source/data/Makefile.in
-index b1b3b36..380cc1a 100644
+index b1b3b36..88e3c35 100644
 --- a/source/data/Makefile.in
 +++ b/source/data/Makefile.in
 @@ -246,7 +246,8 @@ package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata
  #  2010-dec Removed pnames.icu.
  # These are now hardcoded in ICU4C and only loaded in ICU4J.
  #
 -DAT_FILES_SHORT=unames.icu cnvalias.icu coll/ucadata.icu nfkc.nrm nfkc_cf.nrm uts46.nrm
 +# Chromium: Drop unames.icu because we don't need Unicode character names.
 +DAT_FILES_SHORT=cnvalias.icu coll/ucadata.icu nfkc.nrm nfkc_cf.nrm uts46.nrm
  DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%)
  
  ## BRK files
 @@ -277,7 +278,8 @@ CFU_FILES=$(BUILDDIR)/$(CFU_FILES_SHORT)
  -include $(UCMSRCDIR)/ucmfiles.mk
  -include $(UCMSRCDIR)/ucmebcdic.mk
  -include $(UCMSRCDIR)/ucmlocal.mk
 -ALL_UCM_SOURCE=ibm-37_P100-1995.ucm ibm-1047_P100-1995.ucm $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
 +# Chromium: Drop 2 ibm encodings not necessary.
 +ALL_UCM_SOURCE=$(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
  UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%)
  CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv)
  CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv)
-@@ -529,7 +531,14 @@ $(BUILDDIR)/%.icu: $(SRCDATADIR)/in/%.icu
+@@ -351,7 +353,9 @@ TRANSLIT_SRC= $(TRANSLIT_SOURCE) $(TRANSLIT_ALIAS_SOURCE) $(TRANSLIT_SOURCE_LOCA
+ TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%)
+ INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%)  $(TRANSLIT_SOURCE_LOCAL:%.txt=%)
+ endif
+-GENRBOPTS=-k
++# Chromium : To save space, use '-R' option (exclude collation rules. just
++# include the compiled binary data.)
++GENRBOPTS=-k -R
+ 
+ ## MISC files
+ -include $(MISCSRCDIR)/miscfiles.mk
+@@ -529,7 +533,14 @@ $(BUILDDIR)/%.icu: $(SRCDATADIR)/in/%.icu
  $(BUILDDIR)/%.nrm: $(SRCDATADIR)/in/%.nrm
         $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $< $@
  
 -$(BUILDDIR)/coll/ucadata.icu: $(SRCDATADIR)/in/coll/ucadata-unihan.icu
 +# Chromium: To cut down the data size by 280kB,
 +# use the code point order for CJK Ideographs in non-CJK locales instead
 +# of the UniHan radical-stroke order. The latter is better, but non-CJK
 +# locales do not have a great need for sorting CJK Ideographs.
 +# Moreover, the most common subset (the original CJK Ideograph block) will
 +# still be sorted correctly because the code point order is radical-stroke
@@ skipping 32 matching lines @@
          "\t.balign 16\n"
 @@ -264,7 +272,7 @@ writeAssemblyCode(const char *filename, const char *destdir, const char *optEntr
          exit(U_FILE_ACCESS_ERROR);
      }
  
 -    getOutFilename(filename, destdir, bufferStr, entry, ".s", optFilename);
 +    getOutFilename(filename, destdir, bufferStr, entry, ".S", optFilename);
      out=T_FileStream_open(bufferStr, "w");
      if(out==NULL) {
          fprintf(stderr, "genccode: unable to open output file %s\n", bufferStr);