Add back curr/en_* in android_small
Fix wrong android_small.json in last landing which accidentially
put "union" rule on curr_tree in addition to coll_tree.
Bug: v8:10599, v8:10601, 863749
Change-Id: Id952d0c0b2af1d25bad0fc6b4c8cd359dc27785f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/icu/+/2250841
Reviewed-by: Jungshik Shin <jshin@chromium.org>
diff --git a/android_small/icudtl.dat b/android_small/icudtl.dat
index 9bd0f35..3a96fe1 100644
--- a/android_small/icudtl.dat
+++ b/android_small/icudtl.dat
Binary files differ
diff --git a/filters/android_small.json b/filters/android_small.json
index f8b3a22..f864310 100644
--- a/filters/android_small.json
+++ b/filters/android_small.json
@@ -194,67 +194,57 @@
// Removed locales per cast/patch_locale.sh:
// "bn", "et", "gu", "kn", "ml", "mr", "ms", "ta", "te"
"curr_tree": {
- "filterType": "union",
- "unionOf": [
- {
- "whitelist": [
- "en",
- "en_US"
- ]
- },
- {
- "filterType": "language",
- "whitelist": [
+ "filterType": "language",
+ "whitelist": [
// Need to explicitly add "root"
- "root",
+ "root",
- "am",
- "ar",
- "bg",
- "ca",
- "cs",
- "da",
- "de",
- "el",
- "es",
- "fa",
- "fi",
- "fil",
- "fr",
- "he",
- "hi",
- "hr",
- "hu",
- "id",
- "in",
- "it",
- "iw",
- "ja",
- "ko",
- "lt",
- "lv",
- "mo",
- "nb",
- "nl",
- "no",
- "pl",
- "pt",
- "ro",
- "ru",
- "sh",
- "sk",
- "sl",
- "sr",
- "sv",
- "sw",
- "th",
- "tl",
- "tr",
- "uk",
- "vi",
- "zh"
- ]
- }
+ "am",
+ "ar",
+ "bg",
+ "ca",
+ "cs",
+ "da",
+ "de",
+ "el",
+ "en",
+ "es",
+ "fa",
+ "fi",
+ "fil",
+ "fr",
+ "he",
+ "hi",
+ "hr",
+ "hu",
+ "id",
+ "in",
+ "it",
+ "iw",
+ "ja",
+ "ko",
+ "lt",
+ "lv",
+ "mo",
+ "nb",
+ "nl",
+ "no",
+ "pl",
+ "pt",
+ "ro",
+ "ru",
+ "sh",
+ "sk",
+ "sl",
+ "sr",
+ "sv",
+ "sw",
+ "th",
+ "tl",
+ "tr",
+ "uk",
+ "vi",
+ "zh"
]
},
// Based on the ICU63 version of
@@ -304,6 +294,7 @@
"lv",
"mo",
"nb",
+ "nl",
"no",
"pl",
"pt",
diff --git a/filters/ios.json b/filters/ios.json
index 95b85c8..1904728 100644
--- a/filters/ios.json
+++ b/filters/ios.json
@@ -307,6 +307,7 @@
"sv",
"sw",
"th",
+ "tl",
"tr",
"uk",
"vi",
