commit e7fb2a6ebc660c4b60b7a51db927abae100e5bcb
author Elliott Hughes <enh@google.com> Mon Apr 23 12:39:12 2012 -0700
committer Elliott Hughes <enh@google.com> Mon Apr 23 12:39:12 2012 -0700
tree 4c6978ca32e1d585cb5f622f232b76c35c42e30a
parent 90dc30f4b9967e850d0594e57dfa8e7cb0369575

Don't assume that "host" means "linux-x86".

Change-Id: Id6a98e791863ef212bc9e71b62183c4bb7062137

test/etc/host-run-test-jar

diff --git a/test/etc/host-run-test-jar b/test/etc/host-run-test-jar
index b56549e..b892ce9 100755
--- a/test/etc/host-run-test-jar
+++ b/test/etc/host-run-test-jar
@@ -59,7 +59,6 @@
 
 msg "------------------------------"
 
-HOSTBASE="${ANDROID_BUILD_TOP}/out/host"
 DATA_DIR=/tmp
 DEBUG_OPTS="-Xcheck:jni"
 
@@ -75,7 +74,7 @@
     export ANDROID_LOG_TAGS='*:s'
 fi
 export ANDROID_DATA="$DATA_DIR"
-export ANDROID_ROOT="${HOSTBASE}/linux-x86"
+export ANDROID_ROOT="${ANDROID_HOST_OUT}"
 export LD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
 export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
 

test/run-test

diff --git a/test/run-test b/test/run-test
index c3170b6..cd296c1 100755
--- a/test/run-test
+++ b/test/run-test
@@ -57,7 +57,7 @@
 while true; do
     if [ "x$1" = "x--host" ]; then
         RUN="${progdir}/etc/host-run-test-jar"
-        IMAGE=${ANDROID_BUILD_TOP}/out/host/linux-x86/framework/core.art
+        IMAGE=${ANDROID_HOST_OUT}/framework/core.art
         DEX_LOCATION=$tmp_dir
         DEX2OAT_ARGS="--instruction-set=X86 --host-prefix=$ANDROID_BUILD_TOP/"
         shift