commit 7de4cd5dc53ed25fab2ef0cad8ede2035087ca57
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 03:22:29 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 03:22:29 2019 +0000
tree 7ad2af19d45fad17effccaf9fedce672c206bc4c
parent 91aaca279e98877254c94382584926c2e6ced71c
parent a69bb55b5bb63ae58df6f1cbe3b6e5c20808fe8e

Merge "Remove Soong intermdiates after moving image mutator" am: ff81b9d1d0 am: a69bb55b5b

Change-Id: Iedb49b8965ed3fb473f739112f5d58d5451c0824

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index cf9127d..673856c 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -709,6 +709,10 @@
 $(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)
 
+# Remove vendor and recovery variants, the directory name has changed.
+$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_recovery*" -print0 | xargs -0 rm -rf)
+$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_vendor*" -print0 | xargs -0 rm -rf)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************