commit 34dcc88745e2442872f965ca96e1b96daa9cf18c
author Andreas Gampe <agampe@google.com> Tue Jul 01 17:13:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 30 22:50:46 2014 +0000
tree 3a496b861504ec0998f047b1842d9759c8a52c89
parent da52cd3be2e27e3ef1c30caf58dafc45f4f7445e
parent de38833babdf20fec49cdc4453fe6da95646cfad

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

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