Commit 8669edbe authored by Frank Tang's avatar Frank Tang

Reland "Roll ICU to 68-1"

This is a reland of 38e15fd1

Original change's description:
> Roll ICU to 68-1
>
> See https://chromium-review.googlesource.com/c/chromium/deps/icu/+/2511803
> for the actual changes and the details of the data size changes.
>
>
> Cq-Include-Trybots: luci.chromium.try:linux-blink-heap-concurrent-marking-tsan-rel,linux_chromium_tsan_rel_ng,android-asan,linux-libfuzzer-asan-rel,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng,win-asan,linux_chromium_msan_rel_ng,linux_chromium_chromeos_msan_rel_ng,linux_chromium_ubsan_rel_ng,linux-gcc-rel;luci.webrtc.try:linux_tsan2,linux_asan,mac_asan,win_asan,linux_msan,linux_ubsan,linux_ubsan_vptr,linux_compile_gcc_rel
>
> Bug: 1138555,854201,927703
> Change-Id: I8f1b6157f2f1c13c2864836b38e36a37b8c778bf
> Binary-Size: 40K ICU increase due to increase version of ICU.
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2474093
> Commit-Queue: Frank Tang <ftang@chromium.org>
> Reviewed-by: Jungshik Shin <jshin@chromium.org>
> Reviewed-by: Frank Tang <ftang@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#823458}

Bug: 1138555
Bug: 854201
Bug: 927703
Bug: 1145094
Change-Id: I1ba81ab75224a3264da0d50481b48766965efccc
Cq-Include-Trybots: luci.chromium.try:linux-blink-heap-concurrent-marking-tsan-rel,linux_chromium_tsan_rel_ng,android-asan,linux-libfuzzer-asan-rel,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng,win-asan,linux_chromium_msan_rel_ng,linux_chromium_chromeos_msan_rel_ng,linux_chromium_ubsan_rel_ng,linux-gcc-rel;luci.webrtc.try:linux_tsan2,linux_asan,mac_asan,win_asan,linux_msan,linux_ubsan,linux_ubsan_vptr,linux_compile_gcc_rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518034Reviewed-by: default avatarFrank Tang <ftang@chromium.org>
Reviewed-by: default avatarJungshik Shin <jshin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823906}
parent f9a98b3a
...@@ -1043,7 +1043,7 @@ deps = { ...@@ -1043,7 +1043,7 @@ deps = {
Var('chromium_git') + '/chromium/deps/hunspell_dictionaries.git' + '@' + '18e09b9197a3b1d771c077c530d1a4ebad04c167', Var('chromium_git') + '/chromium/deps/hunspell_dictionaries.git' + '@' + '18e09b9197a3b1d771c077c530d1a4ebad04c167',
'src/third_party/icu': 'src/third_party/icu':
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c7c91f829d1d5421be329536811d9336af09b27d', Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c2a4cae149aae7fd30c4cbe3cf1b30df03b386f1',
'src/third_party/icu4j': { 'src/third_party/icu4j': {
'packages': [ 'packages': [
......
...@@ -296,7 +296,7 @@ TEST(TimeFormattingTest, TimeDurationFormat) { ...@@ -296,7 +296,7 @@ TEST(TimeFormattingTest, TimeDurationFormat) {
i18n::SetICUDefaultLocale("da"); i18n::SetICUDefaultLocale("da");
EXPECT_EQ(ASCIIToUTF16("15 timer og 42 minutter"), EXPECT_EQ(ASCIIToUTF16("15 timer og 42 minutter"),
TimeDurationFormatString(delta, DURATION_WIDTH_WIDE)); TimeDurationFormatString(delta, DURATION_WIDTH_WIDE));
EXPECT_EQ(ASCIIToUTF16("15 t og 42 min."), EXPECT_EQ(ASCIIToUTF16("15 t. og 42 min."),
TimeDurationFormatString(delta, DURATION_WIDTH_SHORT)); TimeDurationFormatString(delta, DURATION_WIDTH_SHORT));
EXPECT_EQ(ASCIIToUTF16("15 t og 42 m"), EXPECT_EQ(ASCIIToUTF16("15 t og 42 m"),
TimeDurationFormatString(delta, DURATION_WIDTH_NARROW)); TimeDurationFormatString(delta, DURATION_WIDTH_NARROW));
...@@ -311,9 +311,7 @@ TEST(TimeFormattingTest, TimeDurationFormat) { ...@@ -311,9 +311,7 @@ TEST(TimeFormattingTest, TimeDurationFormat) {
string16 fa_short = UTF8ToUTF16( string16 fa_short = UTF8ToUTF16(
u8"\u06f1\u06f5 \u0633\u0627\u0639\u062a\u060c\u200f \u06f4\u06f2 \u062f" u8"\u06f1\u06f5 \u0633\u0627\u0639\u062a\u060c\u200f \u06f4\u06f2 \u062f"
u8"\u0642\u06cc\u0642\u0647"); u8"\u0642\u06cc\u0642\u0647");
string16 fa_narrow = UTF8ToUTF16( string16 fa_narrow = UTF8ToUTF16(u8"\u06F1\u06F5h \u06F4\u06F2m");
u8"\u06f1\u06f5 \u0633\u0627\u0639\u062a \u06f4\u06f2 \u062f\u0642\u06cc"
u8"\u0642\u0647");
string16 fa_numeric = UTF8ToUTF16(u8"\u06f1\u06f5:\u06f4\u06f2"); string16 fa_numeric = UTF8ToUTF16(u8"\u06f1\u06f5:\u06f4\u06f2");
EXPECT_EQ(fa_wide, TimeDurationFormatString(delta, DURATION_WIDTH_WIDE)); EXPECT_EQ(fa_wide, TimeDurationFormatString(delta, DURATION_WIDTH_WIDE));
EXPECT_EQ(fa_short, TimeDurationFormatString(delta, DURATION_WIDTH_SHORT)); EXPECT_EQ(fa_short, TimeDurationFormatString(delta, DURATION_WIDTH_SHORT));
......
...@@ -14,7 +14,7 @@ Date locale string: 02.04.2020, 20:02:00 ...@@ -14,7 +14,7 @@ Date locale string: 02.04.2020, 20:02:00
Set locale to zh-CN Set locale to zh-CN
Detected locale: zh-CN Detected locale: zh-CN
Date locale string: 2020/4/2 下午8:02:00 Date locale string: 2020/4/2下午8:02:00
Tried to set override from another session, got error: Tried to set override from another session, got error:
Another locale override is already in effect Another locale override is already in effect
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment