OSDN Git Service

Fix OUT_DIR usage
authorDan Willemsen <dwillemsen@google.com>
Fri, 3 Mar 2017 20:35:30 +0000 (12:35 -0800)
committerDan Willemsen <dwillemsen@google.com>
Fri, 3 Mar 2017 20:35:30 +0000 (12:35 -0800)
OUT_DIR is not guaranteed to end with a /

Test: m -j test-art-host-run-test ART_TEST_RUN_TEST_NO_RELOCATE=true
Change-Id: Ic11f4be106b3c67eb22f442f7afaea92bcf46817

test/run-test

index 7d3d813..1ac2857 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=${OUT_DIR:-$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.