From c164b8ef131ab903208d9236b1f6a166f4a43668 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Wed, 6 Mar 2019 17:46:05 +0000 Subject: [PATCH] Remove libicu*.so from /system Bug: 120659668 Test: CtsJniTestCases Change-Id: I1c2ab41aa0b19f71025e2dd09be9b9bd306e8616 --- CleanSpec.mk | 3 +++ target/product/runtime_libart.mk | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 1c02da69f..757c513a4 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -617,6 +617,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/security/avb/) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/super.img) $(call add-clean-step, find $(PRODUCT_OUT) -type f -name "generated_*_image_info.txt" -print0 | xargs -0 rm -f) + +# Clean up libicuuc.so and libicui18n.so +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libicu*) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index dbb4b8289..e08b56be5 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -33,11 +33,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ ext \ -# Libcore ICU. TODO(b/124218500): Remove them explicitly when the bug is resolved. -PRODUCT_PACKAGES += \ - libicui18n \ - libicuuc \ - # Android Runtime APEX module. PRODUCT_PACKAGES += com.android.runtime PRODUCT_HOST_PACKAGES += com.android.runtime