reconcile korg/master into goog/master
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index 4418eb7..e235925 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -39,12 +39,33 @@
# Build configuration:
#
# Japanese wins if required.
+# "Large" includes most other languages.
# US-Euro is needed for IT or PL builds
# Default is suitable for CS, DE, EN, ES, FR, NL
# US has only EN and ES
config := $(word 1, \
+ $(if $(findstring ar,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring da,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring el,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring fi,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring he,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring hr,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring hu,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring id,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring ko,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring nb,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring pt,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring ro,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring ru,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring sk,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring sr,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring sv,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring th,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring tr,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring uk,$(PRODUCT_LOCALES)),large) \
+ $(if $(findstring zh,$(PRODUCT_LOCALES)),large) \
$(if $(findstring ja,$(PRODUCT_LOCALES)),us-japan) \
$(if $(findstring it,$(PRODUCT_LOCALES)),us-euro) \
$(if $(findstring pl,$(PRODUCT_LOCALES)),us-euro) \
@@ -88,6 +109,36 @@
include $(BUILD_SHARED_LIBRARY)
+###### Large
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libicudata-large
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_PRELINK_MODULE := false
+
+ifeq ($(config),large)
+ LOCAL_MODULE_STEM := libicudata
+ LOCAL_MODULE_TAGS := user
+else
+ LOCAL_MODULE_TAGS := optional
+endif
+
+intermediates := $(call local-intermediates-dir)
+icu_data_file := $(LOCAL_PATH)/icudt38l-large.dat
+
+asm_file := $(intermediates)/icu_data_large.S
+LOCAL_GENERATED_SOURCES += $(asm_file)
+$(asm_file): PRIVATE_VAR_NAME := $(icu_var_name)
+$(asm_file): $(icu_data_file) $(ICUDATA)
+ @echo icudata: $@
+ $(hide) mkdir -p $(dir $@)
+ $(hide) $(ICUDATA) $(PRIVATE_VAR_NAME) < $< > $@
+
+LOCAL_CFLAGS += -D_REENTRANT -DPIC -fPIC
+LOCAL_CFLAGS += -O3 -nodefaultlibs -nostdlib
+
+include $(BUILD_SHARED_LIBRARY)
+
###### Euro
include $(CLEAR_VARS)
diff --git a/stubdata/cfg-large/icudt38l.txt b/stubdata/cfg-large/icudt38l.txt
new file mode 100644
index 0000000..5132372
--- /dev/null
+++ b/stubdata/cfg-large/icudt38l.txt
@@ -0,0 +1,196 @@
+brkitr/char.brk
+brkitr/en.res
+brkitr/en_US.res
+brkitr/en_US_POSIX.res
+brkitr/line.brk
+brkitr/res_index.res
+brkitr/root.res
+brkitr/sent.brk
+brkitr/title.brk
+brkitr/word.brk
+brkitr/word_POSIX.brk
+
+coll/cs.res
+coll/cs_CZ.res
+coll/de.res
+coll/de_.res
+coll/de_AT.res
+coll/de_BE.res
+coll/de_CH.res
+coll/de_DE.res
+coll/de_LU.res
+coll/de__PHONEBOOK.res
+coll/en.res
+coll/en_AU.res
+coll/en_BE.res
+coll/en_BW.res
+coll/en_CA.res
+coll/en_GB.res
+coll/en_HK.res
+coll/en_IE.res
+coll/en_IN.res
+coll/en_MT.res
+coll/en_NZ.res
+coll/en_PH.res
+coll/en_SG.res
+coll/en_US.res
+coll/en_US_POSIX.res
+coll/en_VI.res
+coll/en_ZA.res
+coll/en_ZW.res
+coll/es.res
+coll/es_US.res
+coll/fr.res
+coll/fr_FR.res
+coll/it.res
+coll/it_CH.res
+coll/it_IT.res
+coll/nl.res
+coll/nl_BE.res
+coll/nl_NL.res
+coll/pl.res
+coll/pl_PL.res
+coll/res_index.res
+coll/root.res
+
+rbnf/de.res
+rbnf/en.res
+rbnf/en_GB.res
+rbnf/es.res
+rbnf/fr.res
+rbnf/it.res
+rbnf/nl.res
+rbnf/pl.res
+rbnf/res_index.res
+rbnf/root.res
+
+ar.res
+cs.res
+cs_CZ.res
+da.res
+da_DK.res
+de.res
+de_AT.res
+de_BE.res
+de_CH.res
+de_DE.res
+de_LI.res
+de_LU.res
+el.res
+el_GR.res
+en.res
+en_AU.res
+en_BE.res
+en_BW.res
+en_BZ.res
+en_CA.res
+en_GB.res
+en_HK.res
+en_IE.res
+en_IN.res
+en_JM.res
+en_MH.res
+en_MT.res
+en_NA.res
+en_NZ.res
+en_PH.res
+en_PK.res
+en_SG.res
+en_TT.res
+en_US.res
+en_US_POSIX.res
+en_VI.res
+en_ZA.res
+en_ZW.res
+es.res
+es_ES.res
+es_US.res
+fi.res
+fr.res
+fr_BE.res
+fr_CA.res
+fr_CH.res
+fr_FR.res
+fr_LU.res
+fr_MC.res
+he.res
+hr.res
+hu.res
+id.res
+it.res
+it_CH.res
+it_IT.res
+ko.res
+ko_KR.res
+nb.res
+nb_NO.res
+nl.res
+nl_BE.res
+nl_NL.res
+pl.res
+pl_PL.res
+pt.res
+pt_BR.res
+pt_PT.res
+ro.res
+ru.res
+ru_RU.res
+sk.res
+sr.res
+sv.res
+sv_SE.res
+th.res
+tr.res
+tr_TR.res
+uk.res
+zh.res
+zh_CN.res
+zh_Hans.res
+zh_Hans_CN.res
+zh_Hant.res
+zh_Hant_TW.res
+zh_TW.res
+
+gsm-03.38-2000.cnv
+ibm-1089_P100-1995.cnv
+ibm-1383_P110-1999.cnv
+ibm-5012_P100-1999.cnv
+ibm-5346_P100-1998.cnv
+ibm-5347_P100-1998.cnv
+ibm-5348_P100-1997.cnv
+ibm-5349_P100-1998.cnv
+ibm-5350_P100-1998.cnv
+ibm-5354_P100-1998.cnv
+ibm-864_X110-1999.cnv
+ibm-878_P100-1996.cnv
+ibm-9005_X110-2007.cnv
+ibm-912_P100-1995.cnv
+ibm-913_P100-2000.cnv
+ibm-914_P100-1995.cnv
+ibm-915_P100-1995.cnv
+ibm-920_P100-1995.cnv
+ibm-921_P100-1995.cnv
+ibm-923_P100-1998.cnv
+ibm-943_P15A-2003.cnv
+ibm-9447_P100-2002.cnv
+ibm-9448_X100-2005.cnv
+ibm-9449_P100-2002.cnv
+ibm-954_P101-2007.cnv
+iso-8859_10-1998.cnv
+iso-8859_11-2001.cnv
+iso-8859_14-1998.cnv
+iso-8859_16-2001.cnv
+macos-0_2-10.2.cnv
+windows-874-2000.cnv
+windows-936-2000.cnv
+windows-949-2000.cnv
+windows-950-2000.cnv
+
+cnvalias.icu
+invuca.icu
+pnames.icu
+res_index.res
+root.res
+supplementalData.res
+ucadata.icu
+zoneinfo.res
diff --git a/stubdata/cfg-large/icudt38l/brkitr/res_index.txt b/stubdata/cfg-large/icudt38l/brkitr/res_index.txt
new file mode 100644
index 0000000..8f77592
--- /dev/null
+++ b/stubdata/cfg-large/icudt38l/brkitr/res_index.txt
@@ -0,0 +1,8 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+ InstalledLocales {
+ en {""}
+ en_US {""}
+ en_US_POSIX {""}
+ }
+}
diff --git a/stubdata/cfg-large/icudt38l/coll/res_index.txt b/stubdata/cfg-large/icudt38l/coll/res_index.txt
new file mode 100644
index 0000000..3ccacbf
--- /dev/null
+++ b/stubdata/cfg-large/icudt38l/coll/res_index.txt
@@ -0,0 +1,56 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+ InstalledLocales {
+ cs {""}
+ cs_CZ {""}
+
+ de {""}
+ de__PHONEBOOK {""}
+ de_AT {""}
+ de_BE {""}
+ de_CH {""}
+ de_DE {""}
+ de_LU {""}
+
+ en {""}
+ en_AU {""}
+ en_BE {""}
+ en_BW {""}
+ en_CA {""}
+ en_GB {""}
+ en_HK {""}
+ en_IE {""}
+ en_IN {""}
+ en_MT {""}
+ en_NZ {""}
+ en_PH {""}
+ en_SG {""}
+ en_US {""}
+ en_US_POSIX {""}
+ en_VI {""}
+ en_ZA {""}
+ en_ZW {""}
+
+ es {""}
+ es_ES {""}
+ es_US {""}
+
+ fr {""}
+ fr_BE {""}
+ fr_CA {""}
+ fr_CH {""}
+ fr_FR {""}
+ fr_LU {""}
+
+ it {""}
+ it_CH {""}
+ it_IT {""}
+
+ nl {""}
+ nl_BE {""}
+ nl_NL {""}
+
+ pl {""}
+ pl_PL {""}
+ }
+}
diff --git a/stubdata/cfg-large/icudt38l/rbnf/res_index.txt b/stubdata/cfg-large/icudt38l/rbnf/res_index.txt
new file mode 100644
index 0000000..ae5ea14
--- /dev/null
+++ b/stubdata/cfg-large/icudt38l/rbnf/res_index.txt
@@ -0,0 +1,21 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+ InstalledLocales {
+ de {""}
+
+ en {""}
+ en_GB {""}
+
+ es {""}
+
+ fr {""}
+ fr_BE {""}
+ fr_CH {""}
+
+ it {""}
+
+ nl {""}
+
+ pl {""}
+ }
+}
diff --git a/stubdata/cfg-large/icudt38l/res_index.txt b/stubdata/cfg-large/icudt38l/res_index.txt
new file mode 100644
index 0000000..a0152a0
--- /dev/null
+++ b/stubdata/cfg-large/icudt38l/res_index.txt
@@ -0,0 +1,95 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+ CLDRVersion { "1.5" }
+ InstalledLocales {
+ ar {""}
+ cs {""}
+ cs_CZ {""}
+
+ da {""}
+ da_DK {""}
+ de {""}
+ de_AT {""}
+ de_BE {""}
+ de_CH {""}
+ de_DE {""}
+ de_LI {""}
+ de_LU {""}
+
+ el {""}
+ el_GR {""}
+ en {""}
+ en_AU {""}
+ en_BE {""}
+ en_BW {""}
+ en_BZ {""}
+ en_CA {""}
+ en_GB {""}
+ en_HK {""}
+ en_IE {""}
+ en_IN {""}
+ en_JM {""}
+ en_MH {""}
+ en_MT {""}
+ en_NA {""}
+ en_NZ {""}
+ en_PH {""}
+ en_PK {""}
+ en_SG {""}
+ en_TT {""}
+ en_US {""}
+ en_US_POSIX {""}
+ en_VI {""}
+ en_ZA {""}
+ en_ZW {""}
+
+ es {""}
+ es_ES {""}
+ es_US {""}
+
+ fi {""}
+ fr {""}
+ fr_BE {""}
+ fr_CA {""}
+ fr_CH {""}
+ fr_FR {""}
+ fr_LU {""}
+
+ fr_MC {""}
+ he {""}
+ hr {""}
+ hu {""}
+ id {""}
+ it {""}
+ it_CH {""}
+ it_IT {""}
+
+ ko {""}
+ ko_KR {""}
+ nb {""}
+ nb_NO {""}
+ nl {""}
+ nl_BE {""}
+ nl_NL {""}
+
+ pl {""}
+ pl_PL {""}
+ pt {""}
+ pt_BR {""}
+ pt_PT {""}
+ ro {""}
+ ru {""}
+ ru_RU {""}
+ sk {""}
+ sr {""}
+ sv {""}
+ sv_SE {""}
+ th {""}
+ tr {""}
+ tr_TR {""}
+ uk {""}
+ zh {""}
+ zh_CN {""}
+ zh_TW {""}
+ }
+}
diff --git a/stubdata/icudt38l-large.dat b/stubdata/icudt38l-large.dat
new file mode 100644
index 0000000..9249bbf
--- /dev/null
+++ b/stubdata/icudt38l-large.dat
Binary files differ