commit f662e0600ae0e0a1a5f732dc3aae25679ffa102f
author Brian Carlstrom <bdc@google.com> Mon May 19 16:09:42 2014 -0700
committer Brian Carlstrom <bdc@google.com> Mon May 19 18:51:34 2014 -0700
tree 23ebc5172ea4290382220e97dc6fcf16ece5587a
parent 6b522855f913617e00c1783264436145d00cc533

Updating clean-oat again

Also fix test-art-host-oat dex2oat'ing to use the proper new directory layout.

Change-Id: I4a65e88910a72dbe342c814551e4364d73e26e9c

build/Android.common.mk

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