7 files changed, 45 insertions, 2 deletions
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index e2359257..8c76ab4d 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -38,8 +38,8 @@ LOCAL_PATH:= $(call my-dir)
 
 # 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/icudt38l.txt b/stubdata/cfg-large/icudt38l.txt
index 5132372d..0663526b 100644
--- a/stubdata/cfg-large/icudt38l.txt
+++ b/stubdata/cfg-large/icudt38l.txt
@@ -2,6 +2,7 @@ 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
@@ -9,6 +10,7 @@ brkitr/sent.brk
 brkitr/title.brk
 brkitr/word.brk
 brkitr/word_POSIX.brk
+brkitr/word_ja.brk
 
 coll/cs.res
 coll/cs_CZ.res
@@ -45,11 +47,22 @@ 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/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
 
@@ -59,6 +72,7 @@ rbnf/en_GB.res
 rbnf/es.res
 rbnf/fr.res
 rbnf/it.res
+rbnf/ja.res
 rbnf/nl.res
 rbnf/pl.res
 rbnf/res_index.res
@@ -120,6 +134,9 @@ id.res
 it.res
 it_CH.res
 it_IT.res
+ja.res
+ja_JP.res
+ja_JP_TRADITIONAL.res
 ko.res
 ko_KR.res
 nb.res
@@ -186,6 +203,12 @@ 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
diff --git a/stubdata/cfg-large/icudt38l/brkitr/res_index.txt b/stubdata/cfg-large/icudt38l/brkitr/res_index.txt
index 8f775925..84613daf 100644
--- a/stubdata/cfg-large/icudt38l/brkitr/res_index.txt
+++ b/stubdata/cfg-large/icudt38l/brkitr/res_index.txt
@@ -4,5 +4,7 @@ res_index:table(nofallback) {
         en {""}
         en_US {""}
         en_US_POSIX {""}
+
+        ja {""}
     }
 }
diff --git a/stubdata/cfg-large/icudt38l/coll/res_index.txt b/stubdata/cfg-large/icudt38l/coll/res_index.txt
index 3ccacbff..e45b9d1d 100644
--- a/stubdata/cfg-large/icudt38l/coll/res_index.txt
+++ b/stubdata/cfg-large/icudt38l/coll/res_index.txt
@@ -52,5 +52,18 @@ res_index:table(nofallback) {
         
         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/icudt38l/rbnf/res_index.txt b/stubdata/cfg-large/icudt38l/rbnf/res_index.txt
index ae5ea141..6388eb70 100644
--- a/stubdata/cfg-large/icudt38l/rbnf/res_index.txt
+++ b/stubdata/cfg-large/icudt38l/rbnf/res_index.txt
@@ -17,5 +17,7 @@ res_index:table(nofallback) {
         nl {""}
         
         pl {""}
+
+        ja {""}
     }
 }
diff --git a/stubdata/cfg-large/icudt38l/res_index.txt b/stubdata/cfg-large/icudt38l/res_index.txt
index a0152a08..79c92beb 100644
--- a/stubdata/cfg-large/icudt38l/res_index.txt
+++ b/stubdata/cfg-large/icudt38l/res_index.txt
@@ -91,5 +91,8 @@ res_index:table(nofallback) {
         zh {""}
         zh_CN {""}
         zh_TW {""}
+
+        ja {""}
+        ja_JP {""}
     }
 }
diff --git a/stubdata/icudt38l-large.dat b/stubdata/icudt38l-large.dat
index 9249bbf8..50f0b378 100644
--- a/stubdata/icudt38l-large.dat
+++ b/stubdata/icudt38l-large.dat