Android patch: CLDR data: likelySubtags.txt: Remove lots of entries.
This removes all those customizations previously made that no longer are
(or maybe never were) necessary:
https://android.googlesource.com/platform/external/icu/+/9236458
diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt
index 75a6f65..ddd46e1 100644
--- a/icu4c/source/data/misc/likelySubtags.txt
+++ b/icu4c/source/data/misc/likelySubtags.txt
@@ -280,7 +280,6 @@
ja{"ja_Jpan_JP"}
jam{"jam_Latn_JM"}
jgo{"jgo_Latn_CM"}
- ji{"ji_Hebr_UA"}
jmc{"jmc_Latn_TZ"}
jml{"jml_Deva_NP"}
jut{"jut_Latn_DK"}
@@ -746,7 +745,6 @@
und_Arab_MU{"ur_Arab_MU"}
und_Arab_NG{"ha_Arab_NG"}
und_Arab_PK{"ur_Arab_PK"}
- und_Arab_SN{"wo_Arab_SN"}
und_Arab_TH{"mfa_Arab_TH"}
und_Arab_TJ{"fa_Arab_TJ"}
und_Arab_TR{"az_Arab_TR"}
@@ -775,7 +773,6 @@
und_Bass{"bsq_Bass_LR"}
und_Batk{"bbc_Batk_ID"}
und_Beng{"bn_Beng_BD"}
- und_Beng_IN{"bn_Beng_IN"}
und_Bhks{"sa_Bhks_IN"}
und_Bopo{"zh_Bopo_TW"}
und_Brah{"pka_Brah_IN"}
@@ -810,7 +807,6 @@
und_Cyrl_BA{"sr_Cyrl_BA"}
und_Cyrl_GE{"ab_Cyrl_GE"}
und_Cyrl_GR{"mk_Cyrl_GR"}
- und_Cyrl_KZ{"kk_Cyrl_KZ"}
und_Cyrl_MD{"uk_Cyrl_MD"}
und_Cyrl_PL{"be_Cyrl_PL"}
und_Cyrl_RO{"bg_Cyrl_RO"}
@@ -840,9 +836,7 @@
und_Egyp{"egy_Egyp_EG"}
und_Elba{"sq_Elba_AL"}
und_Ethi{"am_Ethi_ET"}
- und_Ethi_ER{"ti_Ethi_ER"}
und_FI{"fi_Latn_FI"}
- und_FJ{"fj_Latn_FJ"}
und_FO{"fo_Latn_FO"}
und_FR{"fr_Latn_FR"}
und_GA{"fr_Latn_GA"}
@@ -856,7 +850,6 @@
und_GR{"el_Grek_GR"}
und_GS{"und_Latn_GS"}
und_GT{"es_Latn_GT"}
- und_GU{"ch_Latn_GU"}
und_GW{"pt_Latn_GW"}
und_Geor{"ka_Geor_GE"}
und_Glag{"cu_Glag_BG"}
@@ -936,14 +929,9 @@
und_Latn_CN{"za_Latn_CN"}
und_Latn_CY{"tr_Latn_CY"}
und_Latn_DZ{"fr_Latn_DZ"}
- und_Latn_ES{"es_Latn_ES"}
und_Latn_ET{"en_Latn_ET"}
- und_Latn_GB{"en_Latn_GB"}
und_Latn_GE{"ku_Latn_GE"}
- und_Latn_GH{"ak_Latn_GH"}
- und_Latn_ID{"id_Latn_ID"}
und_Latn_IR{"tk_Latn_IR"}
- und_Latn_IT{"it_Latn_IT"}
und_Latn_KM{"fr_Latn_KM"}
und_Latn_MA{"fr_Latn_MA"}
und_Latn_MK{"sq_Latn_MK"}
@@ -953,10 +941,8 @@
und_Latn_RU{"krl_Latn_RU"}
und_Latn_SY{"fr_Latn_SY"}
und_Latn_TN{"fr_Latn_TN"}
- und_Latn_TR{"tr_Latn_TR"}
und_Latn_TW{"trv_Latn_TW"}
und_Latn_UA{"pl_Latn_UA"}
- und_Latn_ZA{"af_Latn_ZA"}
und_Lepc{"lep_Lepc_IN"}
und_Limb{"lif_Limb_IN"}
und_Lina{"lab_Lina_GR"}
@@ -970,7 +956,6 @@
und_ME{"sr_Latn_ME"}
und_MF{"fr_Latn_MF"}
und_MG{"mg_Latn_MG"}
- und_MH{"mh_Latn_MH"}
und_MK{"mk_Cyrl_MK"}
und_ML{"bm_Latn_ML"}
und_MM{"my_Mymr_MM"}
@@ -1007,8 +992,6 @@
und_NL{"nl_Latn_NL"}
und_NO{"no_Latn_NO"}
und_NP{"ne_Deva_NP"}
- und_NR{"na_Latn_NR"}
- und_NU{"niu_Latn_NU"}
und_Narb{"xna_Narb_SA"}
und_Nbat{"arc_Nbat_JO"}
und_Newa{"new_Newa_NP"}
diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c
index 2725724..8bac65d 100644
--- a/icu4c/source/test/cintltst/cloctst.c
+++ b/icu4c/source/test/cintltst/cloctst.c
@@ -4005,8 +4005,8 @@
"ur"
}, {
"und_Arab_SN",
- "wo_Arab_SN", /* Google patch */
- "wo_Arab" /* Google patch */
+ "ar_Arab_SN",
+ "ar_SN"
}, {
"und_Armn",
"hy_Armn_AM",
@@ -4137,8 +4137,8 @@
"ru"
}, {
"und_Cyrl_KZ",
- "kk_Cyrl_KZ", /* Google patch */
- "kk" /* Google patch */
+ "ru_Cyrl_KZ",
+ "ru_KZ"
}, {
"und_DE",
"de_Latn_DE",
@@ -4197,8 +4197,8 @@
"am"
}, {
"und_Ethi_ER",
- "ti_Ethi_ER", /* Google patch */
- "ti_ER" /* Google patch */
+ "am_Ethi_ER",
+ "am_ER"
}, {
"und_FI",
"fi_Latn_FI",
@@ -4253,8 +4253,8 @@
"es_GT"
}, {
"und_GU",
- "ch_Latn_GU", /* Google patch */
- "ch" /* Google patch */
+ "en_Latn_GU",
+ "en_GU"
}, {
"und_GW",
"pt_Latn_GW",
@@ -4461,8 +4461,8 @@
"tr"
}, {
"und_Latn_ZA",
- "af_Latn_ZA", /* Google patch */
- "af" /* Google patch */
+ "en_Latn_ZA",
+ "en_ZA"
}, {
"und_MA",
"ar_Arab_MA",
@@ -4485,8 +4485,8 @@
"mg"
}, {
"und_MH",
- "mh_Latn_MH", /* Google patch */
- "mh" /* Google patch */
+ "en_Latn_MH",
+ "en_MH"
}, {
"und_MK",
"mk_Cyrl_MK",
@@ -4577,12 +4577,12 @@
"ne"
}, {
"und_NR",
- "na_Latn_NR", /* Google patch */
- "na" /* Google patch */
+ "en_Latn_NR",
+ "en_NR"
}, {
"und_NU",
- "niu_Latn_NU", /* Google patch */
- "niu" /* Google patch */
+ "en_Latn_NU",
+ "en_NU"
}, {
"und_OM",
"ar_Arab_OM",
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
index 7177d9d..c049a61 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
@@ -2427,8 +2427,8 @@
"ur"
}, {
"und_Arab_SN",
- "wo_Arab_SN", // Android patch: likelySubtags.txt: Add lots of entries.
- "wo_Arab"
+ "ar_Arab_SN",
+ "ar_SN"
}, {
"und_Armn",
"hy_Armn_AM",
@@ -2555,8 +2555,8 @@
"ru"
}, {
"und_Cyrl_KZ",
- "kk_Cyrl_KZ", // Android patch: likelySubtags.txt: Add lots of entries.
- "kk"
+ "ru_Cyrl_KZ",
+ "ru_KZ"
}, {
"und_DE",
"de_Latn_DE",
@@ -2615,8 +2615,8 @@
"am"
}, {
"und_Ethi_ER",
- "ti_Ethi_ER", // Android patch: likelySubtags.txt: Add lots of entries.
- "ti_ER"
+ "am_Ethi_ER",
+ "am_ER"
}, {
"und_FI",
"fi_Latn_FI",
@@ -2671,8 +2671,8 @@
"es_GT"
}, {
"und_GU",
- "ch_Latn_GU", // Android patch: likelySubtags.txt: Add lots of entries.
- "ch"
+ "en_Latn_GU",
+ "en_GU"
}, {
"und_GW",
"pt_Latn_GW",
@@ -2883,8 +2883,8 @@
"tr"
}, {
"und_Latn_ZA",
- "af_Latn_ZA", // Android patch: likelySubtags.txt: Add lots of entries.
- "af"
+ "en_Latn_ZA",
+ "en_ZA"
}, {
"und_MA",
"ar_Arab_MA",
@@ -2991,8 +2991,8 @@
"ne"
}, {
"und_NR",
- "na_Latn_NR", // Android patch: likelySubtags.txt: Add lots of entries.
- "na"
+ "en_Latn_NR",
+ "en_NR"
}, {
"und_OM",
"ar_Arab_OM",
