Make "default" the default ICU data subset.

Bug: 3139942
Change-Id: I147041205c63d7eb61ceb5edff16520a1cab6c24

3 files changed, 1 insertions, 196 deletions

diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index 02618724..93319d4d 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -33,7 +33,6 @@ include $(CLEAR_VARS)
 #
 # icudt44l-default.txt includes cs, de, en, es, fr, it, nl, pl.
 # icudt44l-us-japan.txt includes en, ja.
-# icudt44l-us.txt includes en, es (for voles-eng).
 
 config := $(word 1, \
             $(if $(findstring ar,$(PRODUCT_LOCALES)),large) \
@@ -58,9 +57,7 @@ config := $(word 1, \
             $(if $(findstring uk,$(PRODUCT_LOCALES)),large) \
             $(if $(findstring zh,$(PRODUCT_LOCALES)),large) \
             $(if $(findstring ja,$(PRODUCT_LOCALES)),us-japan) \
-            $(if $(findstring it,$(PRODUCT_LOCALES)),default) \
-            $(if $(findstring pl,$(PRODUCT_LOCALES)),default) \
-            us)
+            default)
 
 include $(LOCAL_PATH)/root.mk
 
diff --git a/stubdata/icudt44l-us.dat b/stubdata/icudt44l-us.dat
deleted file mode 100644
index e5efd7c6..00000000
--- a/stubdata/icudt44l-us.dat
+++ /dev/null
diff --git a/stubdata/icudt44l-us.txt b/stubdata/icudt44l-us.txt
deleted file mode 100644
index 98eb0154..00000000
--- a/stubdata/icudt44l-us.txt
+++ /dev/null
@@ -1,192 +0,0 @@
-brkitr/res_index.res
-brkitr/root.res
-brkitr/char.brk
-brkitr/en.res
-brkitr/en_US.res
-brkitr/en_US_POSIX.res
-brkitr/line.brk
-brkitr/sent.brk
-brkitr/title.brk
-brkitr/word.brk
-brkitr/word_POSIX.brk
-brkitr/thaidict.ctd
-
-coll/res_index.res
-coll/invuca.icu
-coll/ucadata.icu
-coll/root.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_ES.res
-coll/es_US.res
-
-curr/res_index.res
-curr/pool.res
-curr/root.res
-curr/supplementalData.res
-curr/en.res
-curr/en_AU.res
-curr/en_BE.res
-curr/en_BW.res
-curr/en_BZ.res
-curr/en_CA.res
-curr/en_HK.res
-curr/en_JM.res
-curr/en_MT.res
-curr/en_NA.res
-curr/en_NZ.res
-curr/en_PH.res
-curr/en_PK.res
-curr/en_RH.res
-curr/en_SG.res
-curr/en_TT.res
-curr/en_ZW.res
-curr/es.res
-curr/es_AR.res
-curr/es_CL.res
-curr/es_CO.res
-curr/es_EC.res
-curr/es_GT.res
-curr/es_HN.res
-curr/es_MX.res
-curr/es_PR.res
-curr/es_US.res
-curr/es_UY.res
-
-lang/res_index.res
-lang/pool.res
-lang/root.res
-lang/en.res
-lang/en_RH.res
-lang/en_ZW.res
-lang/es.res
-lang/es_AR.res
-lang/es_CL.res
-
-region/res_index.res
-region/root.res
-region/pool.res
-region/en.res
-region/en_RH.res
-region/en_ZW.res
-region/es.res
-region/es_CL.res
-
-zone/res_index.res
-zone/pool.res
-zone/root.res
-zone/en.res
-zone/en_AU.res
-zone/en_CA.res
-zone/en_GB.res
-zone/en_NZ.res
-zone/en_RH.res
-zone/en_ZA.res
-zone/en_ZW.res
-zone/es.res
-
-res_index.res
-pool.res
-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
-macos-7_3-10.2.cnv
-windows-874-2000.cnv
-windows-936-2000.cnv
-windows-949-2000.cnv
-windows-950-2000.cnv
-noop-cns-11643.cnv
-noop-gb2312_gl.cnv
-noop-iso-ir-165.cnv
-
-cnvalias.icu
-pnames.icu
-supplementalData.res
-numberingSystems.res
-plurals.res
-metaZones.res
-rfc3491.spp
-nfc.nrm
-nfkc.nrm
-timezoneTypes.res
-zoneinfo64.res
-icustd.res
-icuver.res
-keyTypeData.res
-
-
-
-
-