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

Commit d4c875d5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6574919 from 1be26db0 to mainline-release 

Change-Id: I461e01bb4c76981cbc5065544eff65537c7762d2
parents c7ac9ab1 1be26db0

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