Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
DO NOT MERGE Update Android ICU data from 2022f to 2022g. [R]
DO NOT MERGE Update Android ICU data from 2022f to 2022g. [S]
Subject: [PATCH] Enable new_robolectric
Android patch: [en-GB][hi_Latn] Use "Türkiye" as the default name for TR.
Re-generate ICU data from TR Country name change in CLDR
DO NOT MERGE Update Android ICU data from 2022e to 2022f. [R]
DO NOT MERGE Update Android ICU data from 2022e to 2022f. [S]
DO NOT MERGE Update Android ICU data from 2022d to 2022e. [R]
DO NOT MERGE Update Android ICU data from 2022d to 2022e. [S]
DO NOT MERGE Update Android data from 2022a2 to 2022d. [R]
DO NOT MERGE Update Android data from 2022a2 to 2022d. [S]
Change-Id: I95bd453ee4923993243030a7bb667c12f8213b70
diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index dabd918..d912c19 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -151,6 +151,7 @@
name: "core-icu4j-for-host",
visibility: [
"//art/build",
+ "//external/robolectric",
"//external/robolectric-shadows",
"//frameworks/layoutlib",
"//packages/modules/RuntimeI18n/apex",
diff --git a/icu4c/source/data/region/ar_XB.txt b/icu4c/source/data/region/ar_XB.txt
index 20e2cd2..ab63137 100644
--- a/icu4c/source/data/region/ar_XB.txt
+++ b/icu4c/source/data/region/ar_XB.txt
@@ -267,7 +267,7 @@
TM{"Turkmenistan"}
TN{"Tunisia"}
TO{"Tonga"}
- TR{"Turkey"}
+ TR{"Türkiye"}
TT{"Trinidad & Tobago"}
TV{"Tuvalu"}
TW{"Taiwan"}
@@ -313,5 +313,6 @@
CZ{"Czech Republic"}
SZ{"Swaziland"}
TL{"East Timor"}
+ TR{"Turkey"}
}
}
diff --git a/icu4c/source/data/region/en.txt b/icu4c/source/data/region/en.txt
index c00c46d..8ccb46e 100644
--- a/icu4c/source/data/region/en.txt
+++ b/icu4c/source/data/region/en.txt
@@ -267,7 +267,7 @@
TM{"Turkmenistan"}
TN{"Tunisia"}
TO{"Tonga"}
- TR{"Turkey"}
+ TR{"Türkiye"}
TT{"Trinidad & Tobago"}
TV{"Tuvalu"}
TW{"Taiwan"}
@@ -313,5 +313,6 @@
CZ{"Czech Republic"}
SZ{"Swaziland"}
TL{"East Timor"}
+ TR{"Turkey"}
}
}
diff --git a/icu4c/source/data/region/en_XA.txt b/icu4c/source/data/region/en_XA.txt
index ae4630e..559a4fa 100644
--- a/icu4c/source/data/region/en_XA.txt
+++ b/icu4c/source/data/region/en_XA.txt
@@ -267,7 +267,7 @@
TM{"[Ţûŕķɱéñîšţåñ one two]"}
TN{"[Ţûñîšîå one two]"}
TO{"[Ţöñĝå one]"}
- TR{"[Ţûŕķéý one]"}
+ TR{"[Ţüŕķîýé one two]"}
TT{"[Ţŕîñîðåð ⅋ Ţöƀåĝö one two three]"}
TV{"[Ţûṽåļû one]"}
TW{"[Ţåîŵåñ one]"}
@@ -313,5 +313,6 @@
CZ{"[Çžéçĥ Ŕéþûƀļîç one two]"}
SZ{"[Šŵåžîļåñð one two]"}
TL{"[Éåšţ Ţîɱöŕ one two]"}
+ TR{"[Ţûŕķéý one]"}
}
}
diff --git a/icu4c/source/stubdata/icudt70l.dat b/icu4c/source/stubdata/icudt70l.dat
index 1ebf7e0..3c44127 100644
--- a/icu4c/source/stubdata/icudt70l.dat
+++ b/icu4c/source/stubdata/icudt70l.dat
Binary files differ
diff --git a/icu4j/Android.bp b/icu4j/Android.bp
index 5ec0112..3faaa8a 100644
--- a/icu4j/Android.bp
+++ b/icu4j/Android.bp
@@ -47,6 +47,8 @@
"//external/jimfs/jimfs",
"//external/robolectric-shadows/robolectric",
"//external/robolectric-shadows/shadows/framework",
+ "//external/robolectric/robolectric",
+ "//external/robolectric/shadows/framework",
"//system/timezone/input_tools/android/telephonylookup_generator",
"//system/timezone/input_tools/android/tzlookup_generator",
],
@@ -127,6 +129,7 @@
name: "icu4j-icudata-jarjar",
visibility: [
"//external/robolectric-shadows",
+ "//external/robolectric",
"//frameworks/layoutlib",
],
defaults: ["icu4j-defaults"],
@@ -138,6 +141,7 @@
name: "icu4j-icutzdata-jarjar",
visibility: [
"//external/robolectric-shadows",
+ "//external/robolectric",
"//frameworks/layoutlib",
],
defaults: ["icu4j-defaults"],
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index e63a08f..f80cfdf 100644
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
Binary files differ