Remove unnecessary files from the runtime module
Removes unnecessary files from the runtime mainline module APEX file:
the files can be found in the time zone data module.
Bug: 132168458
Test: build / boot
Test: atest CtsLibcoreTestCases
Change-Id: I0485080fff9ad627033e022657f3f0292345f7e7
diff --git a/CleanSpec.mk b/CleanSpec.mk
index ef95f40..337e557 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -66,6 +66,10 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/art/runtime/libart/*shared*/obj)
$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/art/runtime/libartd/*shared*/obj)
+# Force regeneration of .apex files after removal of time zone data files from the runtime APEX
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.runtime.*)
+
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index a0f8d87..5610a61 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -83,9 +83,6 @@
// Data files associated with bionic / managed core library APIs.
art_runtime_data_file_prebuilts = [
- "apex_tz_version",
- "apex_tzdata",
- "apex_tzlookup.xml",
"apex_icu.dat",
]