From c9ea2ffc785b9af49cba9be0c0fcf45f057a4069 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 21 Nov 2019 12:34:20 -0800
Subject: [PATCH] Remove Soong intermediates after renaming core variant

Bug: 142286466
Test: m
Change-Id: Ib10a9cf8a8c9109279523f811764afff34969368
---
 CleanSpec.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6e7bf62916..253853de7d 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -716,6 +716,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.cellbroadcast)
 # Remove MediaProvider after moving into APEX
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/MediaProvider)
 
+# 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)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************