commit b586dba65aa66f79d85989cb4c9cfd2f70a8f583
author Dario Freni <dariofreni@google.com> Thu Jun 04 09:42:42 2020 +0000
committer Dario Freni <dariofreni@google.com> Mon Jun 08 18:44:52 2020 +0000
tree 8ab91fe411fe315f63732d86edf5ddc075ad6303
parent a973323a9d6979f0c8cf510caca6dd80504055e9

Use APK CtsShim prebuilts for flattened apex.

Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index c074807..1742bce 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.extservices \
     com.android.i18n \
@@ -71,6 +70,8 @@
     ContactsProvider \
     content \
     crash_dump \
+    CtsShimPrebuilt \
+    CtsShimPrivPrebuilt \
     debuggerd\
     device_config \
     dmctl \