Move CtsShim and CtsPrivShim APKs out of system.
These packages are now available in the shim apex package, which is made
available in both flattened and unflattened apex configurations.
Bug: 138429615
Test: atest CtsPrivilegedUpdateTests CtsPermissionTestCases
CtsStagedInstallHostTestCases; (on both flattened and unflattened
configurations)
Exempt-From-Owner-Approval: approved in
https://android-review.googlesource.com/c/platform/build/+/1180943
Change-Id: I03939f6c3e711d5887da201e32173f86a6b0289e
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 7aba352..a2385e0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -722,6 +722,13 @@
# Remove 'media' command
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/media)
+# 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
# ************************************************