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

Commit 6b030892 authored by Dario Freni's avatar Dario Freni Committed by android-build-merger
Browse files

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

am: 20d1b7d9

Change-Id: I6c79a985f2210042600901ef08f9865b70c26eea
parents 5db15db9 20d1b7d9

CleanSpec.mk

+7 −0
Original line number Diff line number Diff line
@@ -702,6 +702,13 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar) 
# 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 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
@@ -48,7 +48,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 \
@@ -64,8 +64,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