Add rbns/zh.res rbns/ja.res to fix DateTimeFormat
These 2 resources are needed for DateTimeFormat of
calendar: "japanese" under "ja" locale.
calendar: "chinese" under "zh" locale.
Size impact:
before after diff
android 7859808 7869280 9472
android_extra 1498144 1498144 0
android_small. 6500288 6509760. 9472
cast. 5049344 5058816. 9472
chromeos. 10608304 10617776. 9472
common. 10518160 10527632. 9472
flutter. 898416 898416. 0
ios. 6463504 6463504. 0
Test to verify the change in
https://chromium-review.googlesource.com/c/v8/v8/+/2432801
Bug: v8:10960
Change-Id: I108a48dbc35ab5fa9255a518863959866088c7a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/icu/+/2433166
Reviewed-by: Jungshik Shin <jshin@chromium.org>
diff --git a/android/icudtl.dat b/android/icudtl.dat
index abda16e..45b6df7 100644
--- a/android/icudtl.dat
+++ b/android/icudtl.dat
Binary files differ
diff --git a/android_small/icudtl.dat b/android_small/icudtl.dat
index 3a96fe1..a0d3e0e 100644
--- a/android_small/icudtl.dat
+++ b/android_small/icudtl.dat
Binary files differ
diff --git a/cast/icudtl.dat b/cast/icudtl.dat
index ca9a1bd..f6adf85 100644
--- a/cast/icudtl.dat
+++ b/cast/icudtl.dat
Binary files differ
diff --git a/chromeos/icudtl.dat b/chromeos/icudtl.dat
index 9c83516..7e7eb93 100644
--- a/chromeos/icudtl.dat
+++ b/chromeos/icudtl.dat
Binary files differ
diff --git a/common/icudtb.dat b/common/icudtb.dat
index e8a0bfa..008aaf6 100644
--- a/common/icudtb.dat
+++ b/common/icudtb.dat
Binary files differ
diff --git a/common/icudtl.dat b/common/icudtl.dat
index effa45b..12d82ef 100644
--- a/common/icudtl.dat
+++ b/common/icudtl.dat
Binary files differ
diff --git a/filters/android.json b/filters/android.json
index b3ede7b..d38fcc4 100644
--- a/filters/android.json
+++ b/filters/android.json
@@ -377,13 +377,13 @@
}
]
},
-// Based on the ICU63 version of
-// https://cs.chromium.org/chromium/src/third_party/icu/source/data/rbnf/rbnflocal.mk?rcl=797b7c
"rbnf_tree": {
- "filterType": "exclude"
- },
- "rbnf_index": {
- "filterType": "exclude"
+ "whitelist": [
+// Needed by "y=jpanyear" in locales/ja.txt for calendar="japanese"
+ "ja",
+// Needed by "d=hanidays" in locales/zh*.txt for calendar="chinese"
+ "zh"
+ ]
},
// Based on
// https://cs.chromium.org/chromium/src/third_party/icu/android/patch_locale.sh?rcl=797b7c
@@ -1706,7 +1706,6 @@
"coll_tree",
"curr_tree",
"lang_tree",
- "rbnf_tree",
"region_tree",
"unit_tree",
"zone_tree"
diff --git a/filters/android_small.json b/filters/android_small.json
index f864310..494f49c 100644
--- a/filters/android_small.json
+++ b/filters/android_small.json
@@ -316,10 +316,14 @@
}
]
},
-// Based on the ICU63 version of
-// https://cs.chromium.org/chromium/src/third_party/icu/source/data/rbnf/rbnflocal.mk?rcl=797b7c
- "rbnf_tree": { "filterType": "exclude" },
- "rbnf_index": { "filterType": "exclude" },
+ "rbnf_tree": {
+ "whitelist": [
+// Needed by "y=jpanyear" in locales/ja.txt for calendar="japanese"
+ "ja",
+// Needed by "d=hanidays" in locales/zh*.txt for calendar="chinese"
+ "zh"
+ ]
+ },
// Based on
// https://cs.chromium.org/chromium/src/third_party/icu/android/patch_locale.sh?rcl=797b7c
"region_tree": {
@@ -1612,7 +1616,6 @@
"coll_tree",
"curr_tree",
"lang_tree",
- "rbnf_tree",
"region_tree",
"unit_tree",
"zone_tree"
diff --git a/filters/cast.json b/filters/cast.json
index 88a4467..8c18d74 100644
--- a/filters/cast.json
+++ b/filters/cast.json
@@ -637,15 +637,14 @@
"windowsZones"
]
},
-// Based on the ICU63 version of
-// https://cs.chromium.org/chromium/src/third_party/icu/source/data/rbnf/rbnflocal.mk?rcl=797b7c
"rbnf_tree": {
- "filterType": "exclude"
+ "whitelist": [
+// Needed by "y=jpanyear" in locales/ja.txt for calendar="japanese"
+ "ja",
+// Needed by "d=hanidays" in locales/zh*.txt for calendar="chinese"
+ "zh"
+ ]
},
- "rbnf_index": {
- "filterType": "exclude"
- },
-
// Based on the ICU63 version of
// https://cs.chromium.org/chromium/src/third_party/icu/source/data/region/reslocal.mk?rcl=797b7c
// Includes the items from REGION_ALIAS_SOURCE and REGION_SOURCE
@@ -2206,7 +2205,6 @@
"coll_tree",
"curr_tree",
"lang_tree",
- "rbnf_tree",
"region_tree",
"zone_tree"
],
diff --git a/filters/chromeos.json b/filters/chromeos.json
index bef7c2e..cd1005c 100644
--- a/filters/chromeos.json
+++ b/filters/chromeos.json
@@ -327,10 +327,12 @@
]
},
"rbnf_tree": {
- "filterType": "exclude"
- },
- "rbnf_index": {
- "filterType": "exclude"
+ "whitelist": [
+// Needed by "y=jpanyear" in locales/ja.txt for calendar="japanese"
+ "ja",
+// Needed by "d=hanidays" in locales/zh*.txt for calendar="chinese"
+ "zh"
+ ]
},
// Based on the ICU63 version of
// https://cs.chromium.org/chromium/src/third_party/icu/source/data/region/reslocal.mk?rcl=797b7c
@@ -1402,7 +1404,6 @@
"coll_tree",
"curr_tree",
"lang_tree",
- "rbnf_tree",
"region_tree",
"unit_tree",
"zone_tree"
diff --git a/filters/common.json b/filters/common.json
index 5450571..c364ecf 100644
--- a/filters/common.json
+++ b/filters/common.json
@@ -327,10 +327,12 @@
]
},
"rbnf_tree": {
- "filterType": "exclude"
- },
- "rbnf_index": {
- "filterType": "exclude"
+ "whitelist": [
+// Needed by "y=jpanyear" in locales/ja.txt for calendar="japanese"
+ "ja",
+// Needed by "d=hanidays" in locales/zh*.txt for calendar="chinese"
+ "zh"
+ ]
},
// Based on the ICU63 version of
// https://cs.chromium.org/chromium/src/third_party/icu/source/data/region/reslocal.mk?rcl=797b7c
@@ -1829,7 +1831,6 @@
"coll_tree",
"curr_tree",
"lang_tree",
- "rbnf_tree",
"region_tree",
"unit_tree",
"zone_tree"
