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

Commit 1faa3ffe authored by Nikita Ioffe's avatar Nikita Ioffe Committed by android-build-merger
Browse files

Merge "Unconditionally install shim apex on system partition" am: 42b2b54c 

am: e542a799

Change-Id: I112f4eb54236c7bb636b1ea5243c892deb0b7243
parents 2c5def62 e542a799

target/product/base_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ PRODUCT_PACKAGES += \ 
    cgroups.json \

    charger \

    cmd \

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

    com.android.conscrypt \

    com.android.i18n \

    com.android.location.provider \

target/product/mainline_system.mk

+0 −3
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ PRODUCT_HOST_PACKAGES += \ 
# Enable dynamic partition size

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



PRODUCT_PACKAGES += \

    com.android.apex.cts.shim.v1_prebuilt



PRODUCT_ENFORCE_RRO_TARGETS := *



PRODUCT_NAME := mainline_system