diff options
| author | 2019-06-07 14:07:58 +0100 | |
|---|---|---|
| committer | 2019-06-13 14:13:18 +0000 | |
| commit | 44b9b5876f64c6e868d9b13c4fa3a5f5cb773742 (patch) | |
| tree | 4588924f6e5c7afbd1ec1417b3663569c3b1bd8b | |
| parent | 2da955f823c32d72c0dd3f85309bfe664d411eae (diff) | |
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
| -rw-r--r-- | CleanSpec.mk | 4 | ||||
| -rw-r--r-- | build/apex/Android.bp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index ef95f401a8..337e5574b5 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -66,6 +66,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/nativetest*/) $(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 a0f8d8728c..5610a61472 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -83,9 +83,6 @@ art_runtime_debug_native_shared_libs = [ // 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", ] |