diff options
| author | Fredrik Roubert <roubert@google.com> | 2015-03-02 22:56:57 +0100 |
|---|---|---|
| committer | Fredrik Roubert <roubert@google.com> | 2015-03-19 18:00:10 +0100 |
| commit | b160e79c1fdeb76d80c658dd44e7367a48e7c93b (patch) | |
| tree | dc98074064c03efdd1796ea4d10797dfbb2b4c92 /icu4c | |
| parent | 403f9235927b10e42af97a6349c6edee637b82a9 (diff) | |
| download | android_external_icu-b160e79c1fdeb76d80c658dd44e7367a48e7c93b.tar.gz android_external_icu-b160e79c1fdeb76d80c658dd44e7367a48e7c93b.tar.bz2 android_external_icu-b160e79c1fdeb76d80c658dd44e7367a48e7c93b.zip | |
Android patch: Add --omitCollationRules to genrb.
This change was introduced in Android by the ICU54.1 upgrade:
https://android.googlesource.com/platform/external/icu/+/f9878a2
Change-Id: If67d213da5a5f2705e3fb34c14662e693f0ea051
Diffstat (limited to 'icu4c')
| -rw-r--r-- | icu4c/source/data/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in index 4350663bc..4647bc98b 100644 --- a/icu4c/source/data/Makefile.in +++ b/icu4c/source/data/Makefile.in @@ -711,11 +711,13 @@ $(UNIT_INDEX_FILE): $(SRCLISTDEPS) echo "}" >> $@; ### collation res +# BEGIN android-changed. $(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) $(DAT_FILES) - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F) + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) --omitCollationRules $(<F) $(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(TOOLBINDIR)/genrb$(TOOLEXEEXT) - $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt + $(INVOKE) $(TOOLBINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) --omitCollationRules $(INDEX_NAME).txt +#END android-changed $(COLLATION_INDEX_FILE): $(SRCLISTDEPS) @echo "generating $@ (list of installed collation locales)"; \ |