Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp am: f3c2823040
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11789975
Change-Id: I68cbc12fd26caaa62a7d9860fed83aef46f1120c
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index a4c3e4d..2c67b49 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -51,7 +51,6 @@
charger \
cmd \
com.android.adbd \
- com.android.apex.cts.shim.v1 \
com.android.conscrypt \
com.android.cronet \
com.android.extservices \
@@ -71,6 +70,8 @@
com.android.wifi \
ContactsProvider \
content \
+ CtsShimPrebuilt \
+ CtsShimPrivPrebuilt \
debuggerd\
device_config \
dmctl \
diff --git a/target/product/updatable_apex.mk b/target/product/updatable_apex.mk
index e5a647c..a84a0d2 100644
--- a/target/product/updatable_apex.mk
+++ b/target/product/updatable_apex.mk
@@ -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