diff options
Diffstat (limited to 'CleanSpec.mk')
| -rw-r--r-- | CleanSpec.mk | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 6352e38c98..ef9461b2aa 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -505,9 +505,9 @@ $(call add-clean-step, rm -rf $(TARGET_RECOVERY_ROOT_OUT)/etc) # Remove *_OUT_INTERMEDIATE_LIBRARIES $(call add-clean-step, rm -rf $(addsuffix /lib,\ - $(HOST_OUT_INTERMEDIATES) $(2ND_HOST_OUT_INTERMEDIATES) \ - $(HOST_CROSS_OUT_INTERMEDIATES) $(2ND_HOST_CROSS_OUT_INTERMEDIATES) \ - $(TARGET_OUT_INTERMEDIATES) $(2ND_TARGET_OUT_INTERMEDIATES))) +$(HOST_OUT_INTERMEDIATES) $(2ND_HOST_OUT_INTERMEDIATES) \ +$(HOST_CROSS_OUT_INTERMEDIATES) $(2ND_HOST_CROSS_OUT_INTERMEDIATES) \ +$(TARGET_OUT_INTERMEDIATES) $(2ND_TARGET_OUT_INTERMEDIATES))) # Remove strip.sh intermediates to save space $(call add-clean-step, find $(OUT_DIR) \( -name "*.so.debug" -o -name "*.so.dynsyms" -o -name "*.so.funcsyms" -o -name "*.so.keep_symbols" -o -name "*.so.mini_debuginfo.xz" \) -print0 | xargs -0 rm -f) @@ -646,6 +646,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libstagefright_soft*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex) + # Remove libcameraservice and libcamera_client from base_system $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcameraservice.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcamera_client.so) @@ -685,6 +687,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex) # Migrate preopt files to system_other for some devices $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/*app/*/oat) +# Migrate preopt files from system_other for some devices +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other) + # Remove Android Core Library artifacts from the system partition, now # that they live in the ART APEX (b/142944799). $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar) @@ -699,9 +704,24 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*) # again, as the original change removing them was reverted. $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar) +# Remove cas@1.1 from the vendor partition +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.cas@1.1*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.cas@1.1*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.cas@1.1*) + +# Remove com.android.cellbroadcast apex for Go devices +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.cellbroadcast.apex) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.cellbroadcast) + +# Remove MediaProvider after moving into APEX +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/MediaProvider) + # The core image variant has been renamed to "" $(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_core*" -print0 | xargs -0 rm -rf) +# Remove 'media' command +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/media) + # Remove CtsShim apks from system partition, since the have been moved inside # the cts shim apex. Also remove the cts shim apex prebuilt since it has been # removed in flattened apexs configurations. @@ -713,6 +733,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.apex.cts.sh $(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_recovery*" -print0 | xargs -0 rm -rf) $(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_vendor*" -print0 | xargs -0 rm -rf) +# Remove PermissionController after moving into APEX +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/*PermissionController) + # Clean up VTS-Core and VTS10 related artifacts. $(call add-clean-step, rm -rf $(HOST_OUT)/vts-core/*) $(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-core-tradefed.jar) |