import commit 26a1d31721700ac45c81c245716041a545fbdae9
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index dcbb8de..fd773c2 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -41,8 +41,18 @@
# Japanese wins if required.
# 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 :=$(if $(findstring ja_JP,$(PRODUCT_LOCALES)),us-japan,$(if $(findstring it,$(PRODUCT_LOCALES)),us-euro,$(if $(findstring pl,$(PRODUCT_LOCALES)),us-euro,default)))
+
+config := $(or \
+ $(if $(findstring ja,$(PRODUCT_LOCALES)),us-japan), \
+ $(if $(findstring it,$(PRODUCT_LOCALES)),us-euro), \
+ $(if $(findstring pl,$(PRODUCT_LOCALES)),us-euro), \
+ $(if $(findstring cs,$(PRODUCT_LOCALES)),default), \
+ $(if $(findstring de,$(PRODUCT_LOCALES)),default), \
+ $(if $(findstring fr,$(PRODUCT_LOCALES)),default), \
+ $(if $(findstring nl,$(PRODUCT_LOCALES)),default), \
+ us)
icu_var_name := icudt38_dat
##
@@ -138,4 +148,33 @@
include $(BUILD_SHARED_LIBRARY)
+###### US
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libicudata-us
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_PRELINK_MODULE := false
+
+ifeq ($(config),us)
+ 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-us.dat
+
+asm_file := $(intermediates)/icu_data_us.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)
######
diff --git a/stubdata/cfg-us/icudt38l.txt b/stubdata/cfg-us/icudt38l.txt
new file mode 100644
index 0000000..e23f7a6
--- /dev/null
+++ b/stubdata/cfg-us/icudt38l.txt
@@ -0,0 +1,111 @@
+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/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/res_index.res
+coll/root.res
+
+rbnf/en.res
+rbnf/en_GB.res
+rbnf/es.res
+rbnf/res_index.res
+rbnf/root.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_US.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-us/icudt38l/brkitr/res_index.txt b/stubdata/cfg-us/icudt38l/brkitr/res_index.txt
new file mode 100644
index 0000000..8f77592
--- /dev/null
+++ b/stubdata/cfg-us/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-us/icudt38l/coll/res_index.txt b/stubdata/cfg-us/icudt38l/coll/res_index.txt
new file mode 100644
index 0000000..3ccacbf
--- /dev/null
+++ b/stubdata/cfg-us/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-us/icudt38l/rbnf/res_index.txt b/stubdata/cfg-us/icudt38l/rbnf/res_index.txt
new file mode 100644
index 0000000..ae5ea14
--- /dev/null
+++ b/stubdata/cfg-us/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-us/icudt38l/res_index.txt b/stubdata/cfg-us/icudt38l/res_index.txt
new file mode 100644
index 0000000..bbfcc03
--- /dev/null
+++ b/stubdata/cfg-us/icudt38l/res_index.txt
@@ -0,0 +1,63 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+ CLDRVersion { "1.5" }
+ InstalledLocales {
+ cs {""}
+ cs_CZ {""}
+
+ de {""}
+ de_AT {""}
+ de_BE {""}
+ de_CH {""}
+ de_DE {""}
+ de_LI {""}
+ de_LU {""}
+
+ 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 {""}
+
+ 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/icudt38l-us.dat b/stubdata/icudt38l-us.dat
new file mode 100644
index 0000000..d4c3068
--- /dev/null
+++ b/stubdata/icudt38l-us.dat
Binary files differ
