Add ART_DEXPREOPT_BOOT_JAR_DIR.
Replaces DEXPREOPT_BOOT_JAR_DIR which was removed here:
https://android-review.googlesource.com/q/topic:%22dexpreopt_bootjars%22+(status:open%20OR%20status:merged)
Test: art/tools/run-gtests.sh
Change-Id: Ic09ccc17fa689fcb23383e7abda4b9ac24ec2ff1
diff --git a/Android.mk b/Android.mk
index e4cc5c0..de3e2b3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,10 +41,10 @@
$(ADB) shell rm -rf $(ART_TARGET_NATIVETEST_DIR)
$(ADB) shell rm -rf $(ART_TARGET_TEST_DIR)
$(ADB) shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*/*
- $(ADB) shell rm -rf $(DEXPREOPT_BOOT_JAR_DIR)/$(DEX2OAT_TARGET_ARCH)
+ $(ADB) shell rm -rf $(ART_DEXPREOPT_BOOT_JAR_DIR)/$(DEX2OAT_TARGET_ARCH)
$(ADB) shell rm -rf system/app/$(DEX2OAT_TARGET_ARCH)
ifdef TARGET_2ND_ARCH
- $(ADB) shell rm -rf $(DEXPREOPT_BOOT_JAR_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)
+ $(ADB) shell rm -rf $(ART_DEXPREOPT_BOOT_JAR_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)
$(ADB) shell rm -rf system/app/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)
endif
$(ADB) shell rm -rf data/run-test/test-*/dalvik-cache/*