OSDN Git Service

Revert "run-test: Ignore OUT_DIR flag"
authorShubham Ajmera <shubhamajmera@google.com>
Sat, 18 Feb 2017 00:52:37 +0000 (00:52 +0000)
committerShubham Ajmera <shubhamajmera@google.com>
Sat, 18 Feb 2017 00:53:03 +0000 (00:53 +0000)
This reverts commit ad9f7238268c0db4934b5f1bba9814bc002368a0.

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

Change-Id: I9a99fb50145e7b68e52c558520c703853ff57d7f

test/run-test

index d55ba77..c926c11 100755 (executable)
@@ -80,7 +80,7 @@ fi
 
 # 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.