Remove core-simple and other unnecessary things
core-simple has served its purpose so can be removed.
Other demo classes that were demonstrating various APIs
can be removed as we have real examples for them. These are
being deleted at the same time.
Bug: 119301609
Test: build
Change-Id: I3634807690257fb7f419fa36c8c0c22305584762
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 993d1df..746bbb8 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -54,6 +54,16 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/host/common/obj/JAVA_LIBRARIES/core*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core*)
$(call add-clean-step, rm -rf $(OUT_DIR)/host/common/obj/JAVA_LIBRARIES/core*)
+
+# Remove core-simple bootclasspath artifacts
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/framework/*core-simple*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/framework/*/*core-simple*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*core-simple*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*/*core-simple*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*/*core-simple*)
+$(call add-clean-step, touch -c $(OUT_DIR)/host/linux-x86/bin/dex2oat)
+$(call add-clean-step, touch -c $(OUT_DIR)/host/linux-x86/bin/dex2oatd)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************