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

Commit ae2159db authored by Dario Freni's avatar Dario Freni Committed by Automerger Merge Worker
Browse files

Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp... 

Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp am: f3c28230 am: e93b598e

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11789975

Change-Id: I0899451db34a4a24ed4c0c7c68ca7dc453645cf5
parents 0c5aef4d e93b598e

target/product/base_system.mk

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

    cmd \

    com.android.adbd \

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

    com.android.conscrypt \

    com.android.cronet \

    com.android.extservices \
@@ -71,6 +70,8 @@ PRODUCT_PACKAGES += \ 
    com.android.wifi \

    ContactsProvider \

    content \

    CtsShimPrebuilt \

    CtsShimPrivPrebuilt \

    debuggerd\

    device_config \

    dmctl \

target/product/updatable_apex.mk

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



ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)

  # com.android.apex.cts.shim.v1_prebuilt overrides CtsShimPrebuilt

  # and CtsShimPrivPrebuilt since they are packaged inside the APEX.

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

  PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true

  TARGET_FLATTEN_APEX := false