Merge "Unconditionally install shim apex on system partition"

am: 42b2b54c2b

Change-Id: I303417bee4f5143abfda29eadfb997203c0cb168
This commit is contained in:
Nikita Ioffe 2019-10-07 08:36:15 -07:00 committed by android-build-merger
commit e542a799c8
2 changed files with 1 additions and 3 deletions

View File

@ -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 \

View File

@ -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