Apply the changes to upstream-source branch for Change#34199.
Change#34199: Expand "large" ICU configuration to include Japanese and Chinese data.
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index 98f90a7..6402cd0 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -35,8 +35,8 @@
# Build configuration:
#
-# Japanese wins if required.
-# "Large" includes most other languages.
+# "Large" includes all the supported locales.
+# Japanese includes US and Japan.
# 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
diff --git a/stubdata/cfg-large/icudt42l.txt b/stubdata/cfg-large/icudt42l.txt
index e8a4ece..cdf0d7e 100644
--- a/stubdata/cfg-large/icudt42l.txt
+++ b/stubdata/cfg-large/icudt42l.txt
@@ -2,6 +2,7 @@
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
@@ -9,6 +10,7 @@
brkitr/title.brk
brkitr/word.brk
brkitr/word_POSIX.brk
+brkitr/word_ja.brk
coll/cs.res
coll/cs_CZ.res
@@ -45,11 +47,23 @@
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/zh.res
+coll/zh_Hans.res
+coll/zh_Hant.res
+coll/zh_CN.res
+coll/zh_Hans_CN.res
+coll/zh_TW.res
+coll/zh_Hant_TW.res
+coll/zh_HK.res
+coll/zh_Hant_HK.res
+
coll/res_index.res
coll/root.res
@@ -58,6 +72,7 @@
rbnf/es.res
rbnf/fr.res
rbnf/it.res
+rbnf/ja.res
rbnf/nl.res
rbnf/pl.res
rbnf/res_index.res
@@ -119,6 +134,9 @@
it.res
it_CH.res
it_IT.res
+ja.res
+ja_JP.res
+ja_JP_TRADITIONAL.res
ko.res
ko_KR.res
nb.res
@@ -184,6 +202,11 @@
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
coll/invuca.icu
diff --git a/stubdata/cfg-large/icudt42l/brkitr/res_index.txt b/stubdata/cfg-large/icudt42l/brkitr/res_index.txt
index 8f77592..595b22c 100644
--- a/stubdata/cfg-large/icudt42l/brkitr/res_index.txt
+++ b/stubdata/cfg-large/icudt42l/brkitr/res_index.txt
@@ -4,5 +4,6 @@
en {""}
en_US {""}
en_US_POSIX {""}
+ ja {""}
}
}
diff --git a/stubdata/cfg-large/icudt42l/coll/res_index.txt b/stubdata/cfg-large/icudt42l/coll/res_index.txt
index 3ccacbf..e45b9d1 100644
--- a/stubdata/cfg-large/icudt42l/coll/res_index.txt
+++ b/stubdata/cfg-large/icudt42l/coll/res_index.txt
@@ -52,5 +52,18 @@
pl {""}
pl_PL {""}
+
+ ja {""}
+ ja_JP {""}
+
+ zh {""}
+ zh_Hans {""}
+ zh_Hans_CN {""}
+ zh_CN {""}
+ zh_Hant {""}
+ zh_Hant_HK {""}
+ zh_HK {""}
+ zh_Hant_TW {""}
+ zh_TW {""}
}
}
diff --git a/stubdata/cfg-large/icudt42l/rbnf/res_index.txt b/stubdata/cfg-large/icudt42l/rbnf/res_index.txt
index d549c74..46ac74b 100644
--- a/stubdata/cfg-large/icudt42l/rbnf/res_index.txt
+++ b/stubdata/cfg-large/icudt42l/rbnf/res_index.txt
@@ -16,5 +16,7 @@
nl {""}
pl {""}
+
+ ja {""}
}
}
diff --git a/stubdata/cfg-large/icudt42l/res_index.txt b/stubdata/cfg-large/icudt42l/res_index.txt
index 1f877e5..4262537 100644
--- a/stubdata/cfg-large/icudt42l/res_index.txt
+++ b/stubdata/cfg-large/icudt42l/res_index.txt
@@ -91,5 +91,8 @@
zh {""}
zh_CN {""}
zh_TW {""}
+
+ ja {""}
+ ja_JP {""}
}
}
diff --git a/stubdata/icudt42l-large.dat b/stubdata/icudt42l-large.dat
index c65f250..586c42b 100644
--- a/stubdata/icudt42l-large.dat
+++ b/stubdata/icudt42l-large.dat
Binary files differ
