Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp am: f3c2823040 am: e93b598eb8

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11789975

Change-Id: I0899451db34a4a24ed4c0c7c68ca7dc453645cf5

target/product/base_system.mk

@@ -51,7 +51,6 @@ PRODUCT_PACKAGES += \
     charger \
     cmd \
     com.android.adbd \
-    com.android.apex.cts.shim.v1 \
     com.android.conscrypt \
     com.android.cronet \
     com.android.extservices \
@@ -71,6 +70,8 @@ PRODUCT_PACKAGES += \
     com.android.wifi \
     ContactsProvider \
     content \
+    CtsShimPrebuilt \
+    CtsShimPrivPrebuilt \
     debuggerd\
     device_config \
     dmctl \

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