commit 38f566132408ac8bb6e69db3d72b028253159ce4
author Brian Carlstrom <bdc@google.com> Tue Jan 21 00:37:39 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 00:37:40 2014 +0000
tree 61a6030cdeeb62fbae1d0d9260928910205ad5c4
parent 40afcfe964c45452ef22062f993949ef09bd519b
parent b32a3ad73be87835faec086eb587d23570de3296

Merge "Fix bit-rot in clean-oat targets"

Android.mk

diff --git a/Android.mk b/Android.mk
index 612fc40..bdd26da 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,6 +55,8 @@
 	rm -f $(TARGET_OUT_JAVA_LIBRARIES)/*.odex
 	rm -f $(TARGET_OUT_JAVA_LIBRARIES)/*.oat
 	rm -f $(TARGET_OUT_JAVA_LIBRARIES)/*.art
+	rm -f $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR)/*.oat
+	rm -f $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR)/*.art
 	rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*.odex
 	rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*.oat
 	rm -f $(TARGET_OUT_APPS)/*.odex
@@ -71,9 +73,9 @@
 	adb shell rm $(ART_TEST_DIR)/*.odex
 	adb shell rm $(ART_TEST_DIR)/*.oat
 	adb shell rm $(ART_TEST_DIR)/*.art
-	adb shell rm $(DALVIK_CACHE_DIR)/*.dex
-	adb shell rm $(DALVIK_CACHE_DIR)/*.oat
-	adb shell rm $(DALVIK_CACHE_DIR)/*.art
+	adb shell rm $(ART_DALVIK_CACHE_DIR)/*.dex
+	adb shell rm $(ART_DALVIK_CACHE_DIR)/*.oat
+	adb shell rm $(ART_DALVIK_CACHE_DIR)/*.art
 	adb shell rm $(DEXPREOPT_BOOT_JAR_DIR)/*.oat
 	adb shell rm $(DEXPREOPT_BOOT_JAR_DIR)/*.art
 	adb shell rm system/app/*.odex

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 30d7dcb..026dccb 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -89,6 +89,9 @@
 # ART_TARGET_CLANG := true
 # ART_HOST_CLANG := true
 
+# directory used for dalvik-cache on device
+ART_DALVIK_CACHE_DIR := /data/dalvik-cache
+
 # directory used for gtests on device
 ART_NATIVETEST_DIR := /data/nativetest/art
 ART_NATIVETEST_OUT := $(TARGET_OUT_DATA_NATIVE_TESTS)/art