From 9583fbcf597eff6d0b3c5359b8e8d5f70ed82c40 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 28 Feb 2014 15:21:07 +0000 Subject: Remove oat file location in the image. The oat file is now always in the same directory, and has the same name as the image file. Only difference is the extension. This also removes the need for host-prefix. Change-Id: I16d1f7aeb1d58372d41921694664e9c321afc1ad --- test/Android.mk | 2 +- test/etc/host-run-test-jar | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'test') diff --git a/test/Android.mk b/test/Android.mk index e68ad7f..f4a0426 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -115,7 +115,7 @@ test-art-target-oat-$(1): $(ART_TEST_OUT)/oat-test-dex-$(1).jar test-art-target- $(hide) rm /tmp/test-art-target-oat-$(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) --runtime-arg -Xms16m --runtime-arg -Xmx16m --boot-image=$(HOST_CORE_IMG_OUT) --dex-file=$(PWD)/$$< --oat-file=$(PWD)/$$@ --instruction-set=$(HOST_ARCH) --host --host-prefix="" --android-root=$(HOST_OUT) + $(DEX2OAT) --runtime-arg -Xms16m --runtime-arg -Xmx16m --boot-image=$(HOST_CORE_IMG_OUT) --dex-file=$(PWD)/$$< --oat-file=$(PWD)/$$@ --instruction-set=$(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 diff --git a/test/etc/host-run-test-jar b/test/etc/host-run-test-jar index 997e84b..de6ba3f 100755 --- a/test/etc/host-run-test-jar +++ b/test/etc/host-run-test-jar @@ -93,7 +93,6 @@ export ANDROID_DATA="$DEX_LOCATION" export ANDROID_ROOT="${ANDROID_HOST_OUT}" export LD_LIBRARY_PATH="${ANDROID_ROOT}/lib" export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/lib" -unset ANDROID_PRODUCT_OUT # avoid defaulting dex2oat --host-prefix to target output exe="${ANDROID_ROOT}/bin/dalvikvm" -- cgit v1.1