Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c81d71ff authored by Dario Freni's avatar Dario Freni Committed by Android (Google) Code Review
Browse files

Merge "Move CtsShim and CtsPrivShim APKs out of system."

parents de05e271 3e41a7f8

CleanSpec.mk

+7 −0
Original line number Diff line number Diff line
@@ -722,6 +722,13 @@ $(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "andro 
# 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.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/CtsShimPrivPrebuilt)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CtsShimPrebuilt)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.apex.cts.shim.apex)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

target/product/base_system.mk

+1 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ PRODUCT_PACKAGES += \ 
    charger \

    cmd \

    com.android.adbd \

    com.android.apex.cts.shim.v1_prebuilt \

    com.android.apex.cts.shim.v1 \

    com.android.conscrypt \

    com.android.cronet \

    com.android.i18n \
@@ -72,8 +72,6 @@ PRODUCT_PACKAGES += \ 
    ContactsProvider \

    content \

    crash_dump \

    CtsShimPrebuilt \

    CtsShimPrivPrebuilt \

    debuggerd\

    device_config \

    dmctl \

target/product/updatable_apex.mk

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
# Inherit this when the target needs to support updating APEXes



ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)

  PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt

  PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true

  TARGET_FLATTEN_APEX := false

endif