summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2014-10-29 14:05:59 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2014-10-29 14:05:59 +0000
commit8eedb477d13e41e9348f25f222ff16f2e9692a2b (patch)
treebe150eda2978dbbdbc20cd8a5318a5f40e4b7375
parent19324d043dfff0dbfd06ba62fee7dcdd0daa61ee (diff)
Set ANDROID_ROOT correctly for host in test script.
Change-Id: I2cbac266a05c3c731787130584b69dbf3e67e980
-rwxr-xr-xtest/etc/run-test-jar3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index bf790065f3..9b1af70733 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -84,6 +84,7 @@ while true; do
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 @@ else
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"