From 78f86aa083e538cf583bbc7cbeecea412e1ca91d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 21 Nov 2019 12:34:49 -0800
Subject: [PATCH] Remove Soong intermdiates after moving image mutator

Bug: 142286466
Test: m
Change-Id: I76f19a4504b8231755009ab200447613f02b85cf
Merged-In: I76f19a4504b8231755009ab200447613f02b85cf
(cherry picked from commit 559ab613ae1d4945c480fe936de779da3e275bb2)
---
 CleanSpec.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index cf9127d319..673856c469 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -709,6 +709,10 @@ $(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)
 
+# 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
 # ************************************************