commit 1db132d0b88a17d65570199f79be84b844c54c33
author Nicolas Geoffray <ngeoffray@google.com> Wed Mar 26 10:56:24 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Apr 02 09:52:16 2014 +0100
tree 17021c83d26913bd334f874b0e6fdc3e837bd0c8
parent a7f984a23babaa0e4b1b9b6904d18edfcbaa654b

Use debug version of DEX2OAT explicitly.

Change-Id: I57b4c8caedcc6bfbeaa541d8171f8b5b3069c584

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index 0c27349..5879039 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -131,8 +131,8 @@
   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) | $(DEX2OAT)
-	$(DEX2OAT) $(DEX2OAT_FLAGS) --runtime-arg -Xms16m --runtime-arg -Xmx16m --boot-image=$(HOST_CORE_IMG_OUT) --dex-file=$(PWD)/$$< --oat-file=$(PWD)/$$@ --instruction-set=$(ART_HOST_ARCH) --host --android-root=$(HOST_OUT)
+$(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_OUT) --dex-file=$(PWD)/$$< --oat-file=$(PWD)/$$@ --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