commit 8eedb477d13e41e9348f25f222ff16f2e9692a2b
author Nicolas Geoffray <ngeoffray@google.com> Wed Oct 29 14:05:59 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Oct 29 14:05:59 2014 +0000
tree be150eda2978dbbdbc20cd8a5318a5f40e4b7375
parent 19324d043dfff0dbfd06ba62fee7dcdd0daa61ee

Set ANDROID_ROOT correctly for host in test script.

Change-Id: I2cbac266a05c3c731787130584b69dbf3e67e980

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index bf79006..9b1af70 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -84,6 +84,7 @@
         shift
     elif [ "x$1" = "x--host" ]; then
         HOST="y"
+        ANDROID_ROOT="$ANDROID_HOST_OUT"
         shift
     elif [ "x$1" = "x--no-prebuild" ]; then
         PREBUILD="n"
@@ -342,7 +343,7 @@
         export ANDROID_LOG_TAGS='*:s'
     fi
     export ANDROID_DATA="$DEX_LOCATION"
-    export ANDROID_ROOT="${ANDROID_HOST_OUT}"
+    export ANDROID_ROOT="${ANDROID_ROOT}"
     export LD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
     export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
     export PATH="$PATH:${ANDROID_ROOT}/bin"