Sync ART host with device dir structure / add test
This is an attempt to keep the files / directory structure
on host the same as device while files are moved around.
The added test also checks that debug information from
CoreLibraryDebug matches expectations.
Bug: 119293618
Test: make droid / flash / vogar --mode app_process luni/src/test/java/libcore/libcore/icu/TimeZoneIntegrationTest.java
Test: make build-art-host && vogar --mode host luni/src/test/java/libcore/libcore/icu/TimeZoneIntegrationTest.java
Change-Id: I877fbe1015af40174b9de513447cef72f3d67c56
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 3d36a19..e4639a2 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -158,12 +158,6 @@
static_libs: ["android_icu4j_resources_lib"],
java_version: "1.9",
- required: [
- "tzdata",
- "tzlookup.xml",
- "tz_version",
- ],
-
installable: false,
}
@@ -218,12 +212,6 @@
notice: "ojluni/NOTICE",
- required: [
- "tzdata",
- "tzlookup.xml",
- "tz_version",
- ],
-
}
// Contains parts of core library not associated with OpenJDK. Contains not
@@ -254,9 +242,16 @@
},
required: [
+ // Device files put in /system.
"tzdata",
- "tzlookup.xml",
"tz_version",
+ // Files used to simulate the /system and runtime APEX dir
+ // structure on host.
+ "tzdata_host",
+ "tzdata_host_runtime_apex",
+ "tzlookup.xml_host_runtime_apex",
+ "tz_version_host",
+ "tz_version_host_runtime_apex",
],
}
@@ -297,11 +292,6 @@
},
java_version: "1.9",
notice: "ojluni/NOTICE",
- required: [
- "tzdata",
- "tzlookup.xml",
- "tz_version",
- ],
}
java_library {
@@ -316,11 +306,6 @@
enabled: false,
},
notice: "ojluni/NOTICE",
- required: [
- "tzdata",
- "tzlookup.xml",
- "tz_version",
- ],
}