commit de38833babdf20fec49cdc4453fe6da95646cfad
author Andreas Gampe <agampe@google.com> Tue Jul 01 08:25:19 2014 -0700
committer Andreas Gampe <agampe@google.com> Tue Jul 01 10:12:55 2014 -0700
tree 72f7f487c65d2fb92b635fef88214bb5d29526bc
parent ec01b768a6c5fc984a235a25e9a49c651d21354a

ART: Add arch-specific directories to host-oat-cleaning rule

Change-Id: Ia1c5b613067ba6c6648706b346258d0a155906be

Android.mk

diff --git a/Android.mk b/Android.mk
index 6af4041..4b85208 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,8 +40,6 @@
 
 .PHONY: clean-oat-host
 clean-oat-host:
-	rm -rf $(ART_NATIVETEST_OUT)
-	rm -rf $(ART_TEST_OUT)
 	rm -f $(HOST_CORE_IMG_OUT)
 	rm -f $(HOST_CORE_OAT_OUT)
 	rm -f $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/*.odex
@@ -58,7 +56,10 @@
 endif
 	rm -rf $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)
 	rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*.odex
-	rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*.oat
+	rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*/*.oat
+	rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*/*.art
+	rm -f $(TARGET_OUT)/framework/*/*.oat
+	rm -f $(TARGET_OUT)/framework/*/*.art
 	rm -f $(TARGET_OUT_APPS)/*.odex
 	rm -f $(TARGET_OUT_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/javalib.odex
 	rm -f $(TARGET_OUT_INTERMEDIATES)/APPS/*_intermediates/*.odex