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

Commit 2f9cb064 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev am: 7a726856 am: ceb548cd 

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

Change-Id: I72828a04032694c0884898f611a5f97ef651e096
parents 5bfcc95b ceb548cd

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.extservices \

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

    content \

    crash_dump \

    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