commit 42b2b54c2b3961f7a25098e044e3c8261779e712
author Nikita Ioffe <ioffe@google.com> Mon Oct 07 15:10:10 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 07 15:10:10 2019 +0000
tree 0e806743a92e976f4ea602c2d193051d2b2db00a
parent 8ca4bf76d682bfc87028c0acff24ca0388e87205
parent b6eeae7289a1d7d0905c303d5bf5e9501e041189

Merge "Unconditionally install shim apex on system partition"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index a8ed28a..f49218a 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -48,6 +48,7 @@
     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

diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 721f5d9..b8f2838 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -105,9 +105,6 @@
 # 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