import commit 5c3fa97c2281cefb4c9b3b42e64a85c9b25fcc14
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index ede23fe..615ccd6 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -30,7 +30,7 @@
include $(CLEAR_VARS)
##
-icu_data_file := $(LOCAL_PATH)/icudt38l-docomo.dat
+icu_data_file := $(LOCAL_PATH)/$(if $(findstring ja_JP,$(PRODUCT_LOCALES)),icudt38l-us-japan.dat,icudt38l-us-euro.dat)
icu_var_name := icudt38_dat
##
diff --git a/stubdata/cfg-cjk/icudt38l.txt b/stubdata/cfg-cjk/icudt38l.txt
deleted file mode 100644
index 2e01b9d..0000000
--- a/stubdata/cfg-cjk/icudt38l.txt
+++ /dev/null
@@ -1,198 +0,0 @@
-brkitr/char.brk
-brkitr/en.res
-brkitr/en_US.res
-brkitr/en_US_POSIX.res
-brkitr/ja.res
-brkitr/line.brk
-brkitr/res_index.res
-brkitr/root.res
-brkitr/sent.brk
-brkitr/title.brk
-brkitr/word.brk
-brkitr/word_POSIX.brk
-brkitr/word_ja.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/ja.res
-coll/ja_JP.res
-coll/ko.res
-coll/ko_KR.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
-coll/ru.res
-coll/ru_RU.res
-coll/ru_UA.res
-coll/zh.res
-coll/zh_Hans.res
-coll/zh_Hant.res
-coll/zh_Hans_CN.res
-coll/zh_Hant_TW.res
-coll/zh_TW.res
-coll/zh_CN.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
-rbnf/ru.res
-
-cs.res
-cs_CZ.res
-de.res
-de_AT.res
-de_BE.res
-de_CH.res
-de_DE.res
-de_LI.res
-de_LU.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
-fr.res
-fr_BE.res
-fr_CA.res
-fr_CH.res
-fr_FR.res
-fr_LU.res
-fr_MC.res
-it.res
-it_CH.res
-it_IT.res
-ja.res
-ja_JP.res
-ja_JP_TRADITIONAL.res
-ko.res
-ko_KR.res
-nl.res
-nl_BE.res
-nl_NL.res
-pl.res
-pl_PL.res
-ru.res
-ru_RU.res
-ru_UA.res
-zh.res
-zh_Hans.res
-zh_Hant.res
-zh_Hans_CN.res
-zh_Hant_TW.res
-zh_CN.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
-
-docomo-shift_jis-2007.cnv
-kddi-jisx-208-2007.cnv
-kddi-shift_jis-2007.cnv
-softbank-jisx-208-2007.cnv
-softbank-shift_jis-2007.cnv
-
-cnvalias.icu
-invuca.icu
-pnames.icu
-res_index.res
-root.res
-supplementalData.res
-ucadata.icu
-zoneinfo.res
diff --git a/stubdata/cfg-cjk/icudt38l/coll/res_index.txt b/stubdata/cfg-cjk/icudt38l/coll/res_index.txt
deleted file mode 100644
index 847b7ce..0000000
--- a/stubdata/cfg-cjk/icudt38l/coll/res_index.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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 {""}
-
- ja {""}
- ja_JP {""}
-
- ko {""}
- ko_KR {""}
-
- nl {""}
- nl_BE {""}
- nl_NL {""}
-
- pl {""}
- pl_PL {""}
-
- ru {""}
- ru_RU {""}
- ru_AU {""}
-
- zh {""}
- zh_TW {""}
- zh_CN {""}
- zh_Hans {""}
- zh_Hans_CN {""}
- zh_Hant {""}
- zh_Hant_TW {""}
- }
-}
diff --git a/stubdata/cfg-cjk/icudt38l/rbnf/res_index.txt b/stubdata/cfg-cjk/icudt38l/rbnf/res_index.txt
deleted file mode 100644
index 413f7c4..0000000
--- a/stubdata/cfg-cjk/icudt38l/rbnf/res_index.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Warning this file is automatically generated
-res_index:table(nofallback) {
- InstalledLocales {
- de {""}
-
- en {""}
- en_GB {""}
-
- es {""}
-
- fr {""}
- fr_BE {""}
- fr_CH {""}
-
- it {""}
-
- ja {""}
-
- nl {""}
-
- pl {""}
-
- ru {""}
- }
-}
diff --git a/stubdata/cfg-cjk/icudt38l/res_index.txt b/stubdata/cfg-cjk/icudt38l/res_index.txt
deleted file mode 100644
index 61bc997..0000000
--- a/stubdata/cfg-cjk/icudt38l/res_index.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-// 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 {""}
-
- ja {""}
- ja_JP {""}
-
- ko {""}
- ko_KR {""}
-
- nl {""}
- nl_BE {""}
- nl_NL {""}
-
- pl {""}
- pl_PL {""}
-
- ru {""}
- ru_RU {""}
- ru_AU {""}
-
- zh {""}
- zh_TW {""}
- zh_CN {""}
- }
-}
diff --git a/stubdata/cfg-docomo/icudt38l.txt b/stubdata/cfg-docomo/icudt38l.txt
deleted file mode 100644
index a5a4117..0000000
--- a/stubdata/cfg-docomo/icudt38l.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-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
-coll/ru.res
-coll/ru_RU.res
-coll/ru_UA.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
-rbnf/ru.res
-
-cs.res
-cs_CZ.res
-de.res
-de_AT.res
-de_BE.res
-de_CH.res
-de_DE.res
-de_LI.res
-de_LU.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
-fr.res
-fr_BE.res
-fr_CA.res
-fr_CH.res
-fr_FR.res
-fr_LU.res
-fr_MC.res
-it.res
-it_CH.res
-it_IT.res
-ja.res
-ja_JP.res
-ja_JP_TRADITIONAL.res
-nl.res
-nl_BE.res
-nl_NL.res
-pl.res
-pl_PL.res
-ru.res
-ru_RU.res
-ru_UA.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
-
-docomo-shift_jis-2007.cnv
-
-cnvalias.icu
-invuca.icu
-pnames.icu
-res_index.res
-root.res
-supplementalData.res
-ucadata.icu
-zoneinfo.res
diff --git a/stubdata/cfg-docomo/icudt38l/brkitr/res_index.txt b/stubdata/cfg-docomo/icudt38l/brkitr/res_index.txt
deleted file mode 100644
index 8f77592..0000000
--- a/stubdata/cfg-docomo/icudt38l/brkitr/res_index.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// Warning this file is automatically generated
-res_index:table(nofallback) {
- InstalledLocales {
- en {""}
- en_US {""}
- en_US_POSIX {""}
- }
-}
diff --git a/stubdata/cfg-docomo/icudt38l/rbnf/res_index.txt b/stubdata/cfg-docomo/icudt38l/rbnf/res_index.txt
deleted file mode 100644
index 413f7c4..0000000
--- a/stubdata/cfg-docomo/icudt38l/rbnf/res_index.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Warning this file is automatically generated
-res_index:table(nofallback) {
- InstalledLocales {
- de {""}
-
- en {""}
- en_GB {""}
-
- es {""}
-
- fr {""}
- fr_BE {""}
- fr_CH {""}
-
- it {""}
-
- ja {""}
-
- nl {""}
-
- pl {""}
-
- ru {""}
- }
-}
diff --git a/stubdata/cfg-docomo/icudt38l/res_index.txt b/stubdata/cfg-docomo/icudt38l/res_index.txt
deleted file mode 100644
index 7768934..0000000
--- a/stubdata/cfg-docomo/icudt38l/res_index.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-// 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 {""}
-
- ja {""}
- ja_JP {""}
-
- nl {""}
- nl_BE {""}
- nl_NL {""}
-
- pl {""}
- pl_PL {""}
-
- ru {""}
- ru_RU {""}
- ru_AU {""}
- }
-}
diff --git a/stubdata/cfg-euro/icudt38l/coll/res_index.txt b/stubdata/cfg-euro/icudt38l/coll/res_index.txt
deleted file mode 100644
index 3bc14f7..0000000
--- a/stubdata/cfg-euro/icudt38l/coll/res_index.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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 {""}
-
- ru {""}
- ru_RU {""}
- ru_AU {""}
- }
-}
diff --git a/stubdata/cfg-jp/icudt38l/coll/res_index.txt b/stubdata/cfg-jp/icudt38l/coll/res_index.txt
deleted file mode 100644
index bbefdf3..0000000
--- a/stubdata/cfg-jp/icudt38l/coll/res_index.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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 {""}
-
- ja {""}
- ja_JP {""}
-
- nl {""}
- nl_BE {""}
- nl_NL {""}
-
- pl {""}
- pl_PL {""}
-
- ru {""}
- ru_RU {""}
- ru_AU {""}
- }
-}
diff --git a/stubdata/cfg-jp/icudt38l/rbnf/res_index.txt b/stubdata/cfg-jp/icudt38l/rbnf/res_index.txt
deleted file mode 100644
index 413f7c4..0000000
--- a/stubdata/cfg-jp/icudt38l/rbnf/res_index.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Warning this file is automatically generated
-res_index:table(nofallback) {
- InstalledLocales {
- de {""}
-
- en {""}
- en_GB {""}
-
- es {""}
-
- fr {""}
- fr_BE {""}
- fr_CH {""}
-
- it {""}
-
- ja {""}
-
- nl {""}
-
- pl {""}
-
- ru {""}
- }
-}
diff --git a/stubdata/cfg-jp/icudt38l/res_index.txt b/stubdata/cfg-jp/icudt38l/res_index.txt
deleted file mode 100644
index 7768934..0000000
--- a/stubdata/cfg-jp/icudt38l/res_index.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-// 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 {""}
-
- ja {""}
- ja_JP {""}
-
- nl {""}
- nl_BE {""}
- nl_NL {""}
-
- pl {""}
- pl_PL {""}
-
- ru {""}
- ru_RU {""}
- ru_AU {""}
- }
-}
diff --git a/stubdata/cfg-euro/icudt38l.txt b/stubdata/cfg-us-euro/icudt38l.txt
similarity index 96%
rename from stubdata/cfg-euro/icudt38l.txt
rename to stubdata/cfg-us-euro/icudt38l.txt
index 315a6d4..84504dd 100644
--- a/stubdata/cfg-euro/icudt38l.txt
+++ b/stubdata/cfg-us-euro/icudt38l.txt
@@ -52,9 +52,6 @@
coll/pl_PL.res
coll/res_index.res
coll/root.res
-coll/ru.res
-coll/ru_RU.res
-coll/ru_UA.res
rbnf/de.res
rbnf/en.res
@@ -66,7 +63,6 @@
rbnf/pl.res
rbnf/res_index.res
rbnf/root.res
-rbnf/ru.res
cs.res
cs_CZ.res
@@ -118,9 +114,6 @@
nl_NL.res
pl.res
pl_PL.res
-ru.res
-ru_RU.res
-ru_UA.res
gsm-03.38-2000.cnv
ibm-1089_P100-1995.cnv
diff --git a/stubdata/cfg-euro/icudt38l/brkitr/res_index.txt b/stubdata/cfg-us-euro/icudt38l/brkitr/res_index.txt
similarity index 100%
rename from stubdata/cfg-euro/icudt38l/brkitr/res_index.txt
rename to stubdata/cfg-us-euro/icudt38l/brkitr/res_index.txt
diff --git a/stubdata/cfg-docomo/icudt38l/coll/res_index.txt b/stubdata/cfg-us-euro/icudt38l/coll/res_index.txt
similarity index 93%
rename from stubdata/cfg-docomo/icudt38l/coll/res_index.txt
rename to stubdata/cfg-us-euro/icudt38l/coll/res_index.txt
index 3bc14f7..3ccacbf 100644
--- a/stubdata/cfg-docomo/icudt38l/coll/res_index.txt
+++ b/stubdata/cfg-us-euro/icudt38l/coll/res_index.txt
@@ -52,9 +52,5 @@
pl {""}
pl_PL {""}
-
- ru {""}
- ru_RU {""}
- ru_AU {""}
}
}
diff --git a/stubdata/cfg-euro/icudt38l/rbnf/res_index.txt b/stubdata/cfg-us-euro/icudt38l/rbnf/res_index.txt
similarity index 92%
rename from stubdata/cfg-euro/icudt38l/rbnf/res_index.txt
rename to stubdata/cfg-us-euro/icudt38l/rbnf/res_index.txt
index 6acb9ae..ae5ea14 100644
--- a/stubdata/cfg-euro/icudt38l/rbnf/res_index.txt
+++ b/stubdata/cfg-us-euro/icudt38l/rbnf/res_index.txt
@@ -17,7 +17,5 @@
nl {""}
pl {""}
-
- ru {""}
}
}
diff --git a/stubdata/cfg-euro/icudt38l/res_index.txt b/stubdata/cfg-us-euro/icudt38l/res_index.txt
similarity index 94%
rename from stubdata/cfg-euro/icudt38l/res_index.txt
rename to stubdata/cfg-us-euro/icudt38l/res_index.txt
index 33354fd..bbfcc03 100644
--- a/stubdata/cfg-euro/icudt38l/res_index.txt
+++ b/stubdata/cfg-us-euro/icudt38l/res_index.txt
@@ -59,9 +59,5 @@
pl {""}
pl_PL {""}
-
- ru {""}
- ru_RU {""}
- ru_AU {""}
}
}
diff --git a/stubdata/cfg-jp/icudt38l.txt b/stubdata/cfg-us-japan/icudt38l.txt
similarity index 72%
rename from stubdata/cfg-jp/icudt38l.txt
rename to stubdata/cfg-us-japan/icudt38l.txt
index d5036c2..8711d22 100644
--- a/stubdata/cfg-jp/icudt38l.txt
+++ b/stubdata/cfg-us-japan/icudt38l.txt
@@ -12,16 +12,6 @@
brkitr/word_POSIX.brk
brkitr/word_ja.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
@@ -40,47 +30,17 @@
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/ja.res
coll/ja_JP.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
-coll/ru.res
-coll/ru_RU.res
-coll/ru_UA.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/ja.res
rbnf/res_index.res
rbnf/root.res
-rbnf/ru.res
-cs.res
-cs_CZ.res
-de.res
-de_AT.res
-de_BE.res
-de_CH.res
-de_DE.res
-de_LI.res
-de_LU.res
en.res
en_AU.res
en_BE.res
@@ -105,29 +65,9 @@
en_VI.res
en_ZA.res
en_ZW.res
-es.res
-es_US.res
-fr.res
-fr_BE.res
-fr_CA.res
-fr_CH.res
-fr_FR.res
-fr_LU.res
-fr_MC.res
-it.res
-it_CH.res
-it_IT.res
ja.res
ja_JP.res
ja_JP_TRADITIONAL.res
-nl.res
-nl_BE.res
-nl_NL.res
-pl.res
-pl_PL.res
-ru.res
-ru_RU.res
-ru_UA.res
gsm-03.38-2000.cnv
ibm-1089_P100-1995.cnv
diff --git a/stubdata/cfg-cjk/icudt38l/brkitr/res_index.txt b/stubdata/cfg-us-japan/icudt38l/brkitr/res_index.txt
similarity index 100%
rename from stubdata/cfg-cjk/icudt38l/brkitr/res_index.txt
rename to stubdata/cfg-us-japan/icudt38l/brkitr/res_index.txt
diff --git a/stubdata/cfg-us-japan/icudt38l/coll/res_index.txt b/stubdata/cfg-us-japan/icudt38l/coll/res_index.txt
new file mode 100644
index 0000000..4b26d34
--- /dev/null
+++ b/stubdata/cfg-us-japan/icudt38l/coll/res_index.txt
@@ -0,0 +1,26 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+ InstalledLocales {
+ 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 {""}
+
+ ja {""}
+ ja_JP {""}
+ }
+}
diff --git a/stubdata/cfg-jp/icudt38l/brkitr/res_index.txt b/stubdata/cfg-us-japan/icudt38l/rbnf/res_index.txt
similarity index 77%
rename from stubdata/cfg-jp/icudt38l/brkitr/res_index.txt
rename to stubdata/cfg-us-japan/icudt38l/rbnf/res_index.txt
index fe380df..1998adf 100644
--- a/stubdata/cfg-jp/icudt38l/brkitr/res_index.txt
+++ b/stubdata/cfg-us-japan/icudt38l/rbnf/res_index.txt
@@ -2,8 +2,7 @@
res_index:table(nofallback) {
InstalledLocales {
en {""}
- en_US {""}
- en_US_POSIX {""}
+ en_GB {""}
ja {""}
}
diff --git a/stubdata/cfg-us-japan/icudt38l/res_index.txt b/stubdata/cfg-us-japan/icudt38l/res_index.txt
new file mode 100644
index 0000000..05b5dd4
--- /dev/null
+++ b/stubdata/cfg-us-japan/icudt38l/res_index.txt
@@ -0,0 +1,33 @@
+// Warning this file is automatically generated
+res_index:table(nofallback) {
+ CLDRVersion { "1.5" }
+ InstalledLocales {
+ 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 {""}
+
+ ja {""}
+ ja_JP {""}
+ }
+}
diff --git a/stubdata/icudt38l-cjk.dat b/stubdata/icudt38l-cjk.dat
deleted file mode 100644
index d91b0f0..0000000
--- a/stubdata/icudt38l-cjk.dat
+++ /dev/null
Binary files differ
diff --git a/stubdata/icudt38l-docomo.dat b/stubdata/icudt38l-docomo.dat
deleted file mode 100644
index 62626df..0000000
--- a/stubdata/icudt38l-docomo.dat
+++ /dev/null
Binary files differ
diff --git a/stubdata/icudt38l-euro.dat b/stubdata/icudt38l-us-euro.dat
similarity index 92%
rename from stubdata/icudt38l-euro.dat
rename to stubdata/icudt38l-us-euro.dat
index 76ab599..4d79a21 100644
--- a/stubdata/icudt38l-euro.dat
+++ b/stubdata/icudt38l-us-euro.dat
Binary files differ
diff --git a/stubdata/icudt38l-jp.dat b/stubdata/icudt38l-us-japan.dat
similarity index 72%
rename from stubdata/icudt38l-jp.dat
rename to stubdata/icudt38l-us-japan.dat
index 21346e1..14e8839 100644
--- a/stubdata/icudt38l-jp.dat
+++ b/stubdata/icudt38l-us-japan.dat
Binary files differ
diff --git a/stubdata/readme.txt b/stubdata/readme.txt
index 58e0d72..7f7a858 100644
--- a/stubdata/readme.txt
+++ b/stubdata/readme.txt
@@ -74,29 +74,21 @@
before you run it.
- Currently we have these data files and
- configurations (each including the
- previous one):
+ configurations:
- - default ... what we had in Android 1.0
- - euro ...... adds some Euro locales
- - docomo .... adds Japanese locale and
- Docomo Emoji, but leaves
- out break iterators and
- collators as well as
- KDDI and Softbank Emoji.
- - jp ........ adds full Japanese support
- including KDDI and Softbank
- Emoji
- - cjk ....... adds CJK support
+ - default .... what we had in Android 1.0
+ - us-euro .... adds some Euro locales
+ - us-japan ... adds full Japanese locale
+ and Docomo/KDDI/Softbank
+ support
Note that very large data files are likely
to break the prelink map. So this needs to
be modified as well.
-- The Android.mk makefile should pick up the
- new data file during the next build. You
- can select a different data file using a
- variable in the Android.mk file. Note that
- is it possible you have to touch something
- in this directory for the build process to
- notice the changed selection.
+- The correct data file is chosen by the
+ build depending on the PRODUCT_LOCALES
+ variable. Note that is it possible you have
+ to touch something in this directory for
+ the build process to notice the changed
+ selection.
