commit edaf55ec4b3009f65a2bd8c8ea174efde0a56d23
author Shubham Ajmera <shubhamajmera@google.com> Sat Feb 18 00:52:37 2017 +0000
committer Shubham Ajmera <shubhamajmera@google.com> Sat Feb 18 00:53:03 2017 +0000
tree d2ade6fe3a7b4e0a17b00f5fde947e3d0906c3c3
parent ad9f7238268c0db4934b5f1bba9814bc002368a0

Revert "run-test: Ignore OUT_DIR flag"

This reverts commit ad9f7238268c0db4934b5f1bba9814bc002368a0.

Reason for revert: It was a temporary fix to get the build bots green.

Change-Id: I9a99fb50145e7b68e52c558520c703853ff57d7f

test/run-test

diff --git a/test/run-test b/test/run-test
index d55ba77..c926c11 100755
--- a/test/run-test
+++ b/test/run-test
@@ -80,7 +80,7 @@
 
 # ANDROID_HOST_OUT is not set in a build environment.
 if [ -z "$ANDROID_HOST_OUT" ]; then
-    export ANDROID_HOST_OUT=$ANDROID_BUILD_TOP/out/host/linux-x86
+    export ANDROID_HOST_OUT=${OUT_DIR:-$ANDROID_BUILD_TOP/out/}host/linux-x86
 fi
 
 # If JACK_CLASSPATH is not set, assume it only contains core-libart.