Updating clean-oat again
Also fix test-art-host-oat dex2oat'ing to use the proper new directory layout.
Change-Id: I4a65e88910a72dbe342c814551e4364d73e26e9c
diff --git a/Android.mk b/Android.mk
index a7a1556..363e49c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,20 +40,18 @@
.PHONY: clean-oat-host
clean-oat-host:
- rm -f $(ART_NATIVETEST_OUT)/*.odex
- rm -f $(ART_NATIVETEST_OUT)/*.oat
- rm -f $(ART_NATIVETEST_OUT)/*.art
- rm -f $(ART_TEST_OUT)/*.odex
- rm -f $(ART_TEST_OUT)/*.oat
- rm -f $(ART_TEST_OUT)/*.art
- rm -f $(HOST_OUT_JAVA_LIBRARIES)/*.odex
- rm -f $(HOST_OUT_JAVA_LIBRARIES)/*.oat
- rm -f $(HOST_OUT_JAVA_LIBRARIES)/*.art
- 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 -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
+ rm -f $(TARGET_CORE_IMG_OUT)
+ rm -f $(TARGET_CORE_OAT_OUT)
+ifdef TARGET_2ND_ARCH
+ rm -f $(2ND_TARGET_CORE_IMG_OUT)
+ rm -f $(2ND_TARGET_CORE_OAT_OUT)
+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_APPS)/*.odex
@@ -69,24 +67,19 @@
.PHONY: clean-oat-target
clean-oat-target:
adb remount
- adb shell rm -f $(ART_NATIVETEST_DIR)/*.odex
- adb shell rm -f $(ART_NATIVETEST_DIR)/*.oat
- adb shell rm -f $(ART_NATIVETEST_DIR)/*.art
- adb shell rm -f $(ART_TEST_DIR)/*.odex
- adb shell rm -f $(ART_TEST_DIR)/*.oat
- adb shell rm -f $(ART_TEST_DIR)/*.art
+ adb shell rm -rf $(ART_NATIVETEST_DIR)
+ adb shell rm -rf $(ART_TEST_DIR)
ifdef TARGET_2ND_ARCH
- adb shell rm -f $(2ND_ART_NATIVETEST_DIR)/*.odex
- adb shell rm -f $(2ND_ART_NATIVETEST_DIR)/*.oat
- adb shell rm -f $(2ND_ART_NATIVETEST_DIR)/*.art
- adb shell rm -f $(2ND_ART_TEST_DIR)/*.odex
- adb shell rm -f $(2ND_ART_TEST_DIR)/*.oat
- adb shell rm -f $(2ND_ART_TEST_DIR)/*.art
+ adb shell rm -rf $(2ND_ART_NATIVETEST_DIR)
+ adb shell rm -rf $(2ND_ART_TEST_DIR)
endif
adb shell rm -rf $(ART_DALVIK_CACHE_DIR)/*
- adb shell rm -f $(DEXPREOPT_BOOT_JAR_DIR)/*.oat
- adb shell rm -f $(DEXPREOPT_BOOT_JAR_DIR)/*.art
- adb shell rm -f system/app/*.odex
+ adb shell rm -rf $(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 system/app/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)
+endif
adb shell rm -rf data/run-test/test-*/dalvik-cache/*
ifneq ($(art_dont_bother),true)
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 175cc6e..08208b4 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -389,5 +389,24 @@
endif
endef
+HOST_CORE_OAT := $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/core.oat
+TARGET_CORE_OAT := $(ART_TEST_DIR)/$(DEX2OAT_TARGET_ARCH)/core.oat
+ifdef TARGET_2ND_ARCH
+2ND_TARGET_CORE_OAT := $(2ND_ART_TEST_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/core.oat
+endif
+
+HOST_CORE_OAT_OUT := $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/core.oat
+TARGET_CORE_OAT_OUT := $(ART_TEST_OUT)/$(DEX2OAT_TARGET_ARCH)/core.oat
+ifdef TARGET_2ND_ARCH
+2ND_TARGET_CORE_OAT_OUT := $(ART_TEST_OUT)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/core.oat
+endif
+
+HOST_CORE_IMG_OUT := $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/core.art
+TARGET_CORE_IMG_OUT := $(ART_TEST_OUT)/$(DEX2OAT_TARGET_ARCH)/core.art
+ifdef TARGET_2ND_ARCH
+2ND_TARGET_CORE_IMG_OUT := $(ART_TEST_OUT)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/core.art
+endif
+
+HOST_CORE_IMG_LOCATION := $(HOST_OUT_JAVA_LIBRARIES)/core.art
endif # ANDROID_COMMON_MK
diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 4e8d1cc..bf07ecc 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -29,26 +29,6 @@
HOST_CORE_DEX_FILES := $(foreach jar,$(HOST_CORE_JARS), $(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),t,COMMON)/javalib.jar)
TARGET_CORE_DEX_FILES := $(foreach jar,$(TARGET_CORE_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar), ,COMMON)/javalib.jar)
-HOST_CORE_OAT := $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/core.oat
-TARGET_CORE_OAT := $(ART_TEST_DIR)/$(DEX2OAT_TARGET_ARCH)/core.oat
-ifdef TARGET_2ND_ARCH
-2ND_TARGET_CORE_OAT := $(2ND_ART_TEST_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/core.oat
-endif
-
-HOST_CORE_OAT_OUT := $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/core.oat
-TARGET_CORE_OAT_OUT := $(ART_TEST_OUT)/$(DEX2OAT_TARGET_ARCH)/core.oat
-ifdef TARGET_2ND_ARCH
-2ND_TARGET_CORE_OAT_OUT := $(ART_TEST_OUT)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/core.oat
-endif
-
-HOST_CORE_IMG_OUT := $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/core.art
-TARGET_CORE_IMG_OUT := $(ART_TEST_OUT)/$(DEX2OAT_TARGET_ARCH)/core.art
-ifdef TARGET_2ND_ARCH
-2ND_TARGET_CORE_IMG_OUT := $(ART_TEST_OUT)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/core.art
-endif
-
-HOST_CORE_IMG_LOCATION := $(HOST_OUT_JAVA_LIBRARIES)/core.art
-
TARGET_INSTRUCTION_SET_FEATURES := $(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
# Use dex2oat debug version for better error reporting
diff --git a/test/Android.mk b/test/Android.mk
index a3aabe6..0684c90 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -134,11 +134,11 @@
endif
$(call declare-test-art-oat-targets-impl,$(1),)
-$(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex: $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar $(HOST_CORE_IMG_OUT) | $(DEX2OATD)
- $(DEX2OATD) $(DEX2OAT_FLAGS) --runtime-arg -Xms16m --runtime-arg -Xmx16m --boot-image=$(HOST_CORE_IMG_LOCATION) --dex-file=$$(realpath $$<) --oat-file=$$(realpath $(HOST_OUT_JAVA_LIBRARIES))/oat-test-dex-$(1).odex --instruction-set=$(ART_HOST_ARCH) --host --android-root=$(HOST_OUT)
+$(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/oat-test-dex-$(1).odex: $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar $(HOST_CORE_IMG_OUT) | $(DEX2OATD)
+ $(DEX2OATD) $(DEX2OAT_FLAGS) --runtime-arg -Xms16m --runtime-arg -Xmx16m --boot-image=$(HOST_CORE_IMG_LOCATION) --dex-file=$$(realpath $$<) --oat-file=$$@ --instruction-set=$(ART_HOST_ARCH) --host --android-root=$(HOST_OUT)
.PHONY: test-art-host-oat-default-$(1)
-test-art-host-oat-default-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex test-art-host-dependencies
+test-art-host-oat-default-$(1): $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/oat-test-dex-$(1).odex test-art-host-dependencies
mkdir -p /tmp/android-data/test-art-host-oat-default-$(1)
ANDROID_DATA=/tmp/android-data/test-art-host-oat-default-$(1) \
ANDROID_ROOT=$(HOST_OUT) \
@@ -148,7 +148,7 @@
$(hide) rm -r /tmp/android-data/test-art-host-oat-default-$(1)
.PHONY: test-art-host-oat-interpreter-$(1)
-test-art-host-oat-interpreter-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex test-art-host-dependencies
+test-art-host-oat-interpreter-$(1): $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/oat-test-dex-$(1).odex test-art-host-dependencies
mkdir -p /tmp/android-data/test-art-host-oat-interpreter-$(1)
ANDROID_DATA=/tmp/android-data/test-art-host-oat-interpreter-$(1) \
ANDROID_ROOT=$(HOST_OUT) \