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

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 51beedc..c8f2014 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -43,10 +43,11 @@
 
 TARGET_INSTRUCTION_SET_FEATURES := $(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
 
-$(HOST_CORE_IMG_OUT): $(HOST_CORE_DEX_FILES) $(DEX2OAT_DEPENDENCY)
+# Use dex2oat debug version for better error reporting
+$(HOST_CORE_IMG_OUT): $(HOST_CORE_DEX_FILES) $(DEX2OATD_DEPENDENCY)
 	@echo "host dex2oat: $@ ($?)"
 	@mkdir -p $(dir $@)
-	$(hide) $(DEX2OAT) --runtime-arg -Xms16m --runtime-arg -Xmx16m --image-classes=$(PRELOADED_CLASSES) $(addprefix \
+	$(hide) $(DEX2OATD) --runtime-arg -Xms16m --runtime-arg -Xmx16m --image-classes=$(PRELOADED_CLASSES) $(addprefix \
 		--dex-file=,$(HOST_CORE_DEX_FILES)) $(addprefix --dex-location=,$(HOST_CORE_DEX_LOCATIONS)) --oat-file=$(HOST_CORE_OAT_OUT) \
 		--oat-location=$(HOST_CORE_OAT) --image=$(HOST_CORE_IMG_OUT) --base=$(LIBART_IMG_HOST_BASE_ADDRESS) \
 		--instruction-set=$(ART_HOST_ARCH) --host --android-root=$(HOST_OUT)