Move libcore.timezone classes to I18n module
Note that this CL does not miminize @IntraCoreApi surface.
Bug: 141747409
Test: atest CtsLibcoreOjTestCases CtsLibcoreTestCases CtsIcuTestCases
Merged-In: I8da8fe64c3ecf94f5de3e597dd98cdbd5c1eecf5
Change-Id: I8da8fe64c3ecf94f5de3e597dd98cdbd5c1eecf5
diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index 5f40abe..6749993 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -50,6 +50,18 @@
path: "libcore_bridge/src/java",
}
+// timezone-related source that is also used in host tests / tools and its
+// dependencies.
+filegroup {
+ name: "timezone_host_files",
+ srcs: [
+ "libcore_bridge/src/java/com/android/i18n/timezone/TimeZoneDataFiles.java",
+ "libcore_bridge/src/java/com/android/i18n/timezone/TzDataSetVersion.java",
+ ],
+ path: "libcore_bridge/src/java",
+ visibility: ["//libcore"],
+}
+
// core-repackaged-icu4j contains only the repackaged ICU4J that does not
// use any internal or android specific code. If it ever did then it could depend on
// art-module-intra-core-api-stubs-system-modules (a superset) instead.
@@ -94,6 +106,7 @@
permitted_packages: [
"android.icu",
"com.android.icu",
+ "com.android.i18n.timezone",
],
installable: true,
hostdex: false,
@@ -309,6 +322,7 @@
static_libs: [
"junit",
"junit-params",
+ "tzdata-testing",
],
patch_module: "java.base",