From 66ce55d90d5950fc680df7ad8e255ac4f26d1208 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
Merged-In: Ib10a9cf8a8c9109279523f811764afff34969368
(cherry picked from commit c293f9583e4ac726c1c44406725e2bbf7d3efdad)
---
 CleanSpec.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6c5ecd901d..42bcb3c24b 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -699,6 +699,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*)
 # again, as the original change removing them was reverted.
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)
 
+# 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
 # ************************************************