Move timezone-host library to the com.android.i18n module.
To support it, make art.module.api.annotations available and export it
in art-module-host-exports.
Also clean up the timezone_host_libcore_files filegroup which isn't
used anywhere now.
Test: See https://r.android.com/1495078
Bug: 172480615
Change-Id: I2437c4bd9313732880a8e4046af9e215857aed33
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 64d1150..8b50e21 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -991,21 +991,6 @@
check_nullability_warnings: "nullability_warnings.txt",
}
-// A host library containing time zone related classes. Used for
-// host-side tools and tests that have to deal with Android
-// time zone data.
-java_library_host {
- name: "timezone-host",
- visibility: [
- "//art/build/sdk",
- "//system/timezone/distro/core",
- ],
- srcs: [
- ":timezone_host_files",
- ":timezone_host_libcore_files",
- ],
-}
-
// A special set of system modules for building the following library for use
// in the art-module-public-api-system-modules.
java_system_modules {
@@ -1037,6 +1022,8 @@
java_library {
name: "art.module.api.annotations",
visibility: [
+ "//art/build/sdk",
+ "//external/icu/android_icu4j",
"//frameworks/base",
],
host_supported: true,