Remove unnecessary files from target test env
Remove unnecessary files from the simulation of the
runtime mainline module used in ART for on-device testing.
The files are being removed from the real runtime module
in a separate commit.
Bug: 132169989
Test: Run ART tests on device (in chroot environment)
Change-Id: I37dcddd62dac0fc5a7d1ed101c0b90e92bff6faa
diff --git a/output_data/CleanSpec.mk b/output_data/CleanSpec.mk
index 2d0bacc..df1d3c5 100644
--- a/output_data/CleanSpec.mk
+++ b/output_data/CleanSpec.mk
@@ -55,6 +55,10 @@
# Remove host files that simulate time zone data files in the runtime mainline module APEX.
$(call add-clean-step, rm -rf $(HOST_OUT)/com.android.runtime/etc/tz/*)
+# Remove on-device files that simulate time zone data files in the runtime
+# mainline module APEX in ART's special on-device test environment.
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/tz)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/output_data/android/Android.bp b/output_data/android/Android.bp
index d79a7fc..57032de 100644
--- a/output_data/android/Android.bp
+++ b/output_data/android/Android.bp
@@ -13,22 +13,13 @@
// limitations under the License.
// Module definition producing a tzlookup.xml prebuilt file in
-// /system/etc/tz for standalone ART testing purposes. This is a
-// temporary change needed until the ART Buildbot and Golem both fully
-// support the Runtime APEX (see b/121117762). This module should never
-// be shipped by default (i.e. should never be part of
+// /system/etc/tzdata_module/etc/tz for standalone ART testing purposes.
+// This is a temporary change needed until the ART Buildbot and Golem both
+// fully support the Runtime APEX (see b/121117762). This module should
+// never be shipped by default (i.e. should never be part of
// `PRODUCT_PACKAGE`.)
// TODO(b/121117762, b/129332183): Remove this module definition when
-// the ART Buildbot and Golem have full support for the Runtime APEX.
-prebuilt_etc {
- name: "tzlookup.xml-art-test-runtime",
- src: "tzlookup.xml",
- filename_from_src: true,
- sub_dir: "tz",
-}
-
-// TODO(b/121117762, b/129332183): Remove this module definition when
// the ART Buildbot and Golem have full support for the Time Zone Data APEX.
prebuilt_etc {
name: "tzlookup.xml-art-test-tzdata",
diff --git a/output_data/iana/Android.bp b/output_data/iana/Android.bp
index 4eb8dab..650549a 100644
--- a/output_data/iana/Android.bp
+++ b/output_data/iana/Android.bp
@@ -35,20 +35,10 @@
}
// Module definition producing a tzdata prebuilt file in
-// /system/etc/tz for standalone ART testing purposes. This is a
-// temporary change needed until the ART Buildbot and Golem both fully
-// support the Runtime APEX (see b/121117762). This module should never
-// be shipped by default (i.e. should never be part of
-// `PRODUCT_PACKAGE`.)
-
-// TODO(b/121117762, b/129332183): Remove this module definition when
-// the ART Buildbot and Golem have full support for the Runtime APEX.
-prebuilt_etc {
- name: "tzdata-art-test-runtime",
- src: "tzdata",
- filename_from_src: true,
- sub_dir: "tz",
-}
+// /system/etc/tzdata_module/etc/tz for standalone ART testing purposes.
+// This is a temporary change needed until the ART Buildbot and Golem both
+// fully support the Runtime APEX (see b/121117762). This module should never
+// be shipped by default (i.e. should never be part of `PRODUCT_PACKAGE`.)
// TODO(b/121117762, b/129332183): Remove this module definition when
// the ART Buildbot and Golem have full support for the Time Zone Data APEX.
diff --git a/output_data/version/Android.bp b/output_data/version/Android.bp
index 4473053..8bf1efa 100644
--- a/output_data/version/Android.bp
+++ b/output_data/version/Android.bp
@@ -34,20 +34,10 @@
}
// Module definition producing a tz_version prebuilt file in
-// /system/etc/tz for standalone ART testing purposes. This is a
-// temporary change needed until the ART Buildbot and Golem both fully
+// /system/etc/tzdata_module/etc/tz for standalone ART testing purposes.
+// This is a temporary change needed until the ART Buildbot and Golem both fully
// support the Runtime APEX (see b/121117762). This module should never
-// be shipped by default (i.e. should never be part of
-// `PRODUCT_PACKAGE`.)
-
-// TODO(b/121117762, b/129332183): Remove this module definition when
-// the ART Buildbot and Golem have full support for the Runtime APEX.
-prebuilt_etc {
- name: "tz_version-art-test-runtime",
- src: "tz_version",
- filename_from_src: true,
- sub_dir: "tz",
-}
+// be shipped by default (i.e. should never be part of `PRODUCT_PACKAGE`.)
// TODO(b/121117762, b/129332183): Remove this module definition when
// the ART Buildbot and Golem have full support for the Time Zone Data APEX.
