Merge "Move CtsShim and CtsPrivShim APKs out of system." am: 20d1b7d966 am: 6b0308921b
Change-Id: If7799ae7bd9e6613b3ff5eb06801b7c31b17ff97
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 42bcb3c..cf9127d 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -702,6 +702,13 @@
# The core image variant has been renamed to ""
$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_core*" -print0 | xargs -0 rm -rf)
+# Remove CtsShim apks from system partition, since the have been moved inside
+# the cts shim apex. Also remove the cts shim apex prebuilt since it has been
+# removed in flattened apexs configurations.
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/CtsShimPrivPrebuilt)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CtsShimPrebuilt)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.apex.cts.shim.apex)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 95e6fb0..d15e262 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -48,7 +48,7 @@
charger \
cmd \
com.android.adbd \
- com.android.apex.cts.shim.v1_prebuilt \
+ com.android.apex.cts.shim.v1 \
com.android.conscrypt \
com.android.cronet \
com.android.i18n \
@@ -64,8 +64,6 @@
ContactsProvider \
content \
crash_dump \
- CtsShimPrebuilt \
- CtsShimPrivPrebuilt \
debuggerd\
device_config \
dmctl \
diff --git a/target/product/updatable_apex.mk b/target/product/updatable_apex.mk
index bdaf545..e5a647c 100644
--- a/target/product/updatable_apex.mk
+++ b/target/product/updatable_apex.mk
@@ -17,6 +17,7 @@
# Inherit this when the target needs to support updating APEXes
ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)
+ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt
PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true
TARGET_FLATTEN_APEX := false
endif