summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-03-26 10:56:24 +0000
committerNicolas Geoffray <ngeoffray@google.com>2014-04-02 09:52:16 +0100
commit1db132d0b88a17d65570199f79be84b844c54c33 (patch)
tree17021c83d26913bd334f874b0e6fdc3e837bd0c8 /test
parenta7f984a23babaa0e4b1b9b6904d18edfcbaa654b (diff)
downloadandroid_art-1db132d0b88a17d65570199f79be84b844c54c33.tar.gz
android_art-1db132d0b88a17d65570199f79be84b844c54c33.tar.bz2
android_art-1db132d0b88a17d65570199f79be84b844c54c33.zip
Use debug version of DEX2OAT explicitly.
Change-Id: I57b4c8caedcc6bfbeaa541d8171f8b5b3069c584
Diffstat (limited to 'test')
-rw-r--r--test/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Android.mk b/test/Android.mk
index 0c27349111..5879039b00 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -131,8 +131,8 @@ test-art-target-oat-$(1): test-art-target-oat-$(1)$(ART_PHONY_TEST_TARGET_SUFFIX
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