commit 6354bb830cc9ccec61c6fd47580842a1b4673cd5
author Nicolas Geoffray <ngeoffray@google.com> Wed Jul 02 16:25:12 2014 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jul 02 16:25:12 2014 +0100
tree 01ee42fbc39a0c378c32ab3cca15090272098068
parent 395fa7286ca2c6cd3dd55c0eab5b0f69dc063fb8

Fix art script for 'clean' environments.

We need to define ANDROID_HOST_OUT in the script before using it.

Change-Id: I6b415d8de5fb6001bc579b013683957abb33f394

tools/art

diff --git a/tools/art b/tools/art
index cc5c867..85517d3 100755
--- a/tools/art
+++ b/tools/art
@@ -42,6 +42,11 @@
   echo "$file"
 }
 
+PROG_NAME="$(follow_links "$BASH_SOURCE")"
+PROG_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
+ANDROID_BUILD_TOP="$(cd "${PROG_DIR}/../../../../" ; pwd -P)/"
+ANDROID_HOST_OUT=$PROG_DIR/..
+ANDROID_DATA=$PWD/android-data$$
 DALVIKVM_EXECUTABLE=$ANDROID_HOST_OUT/bin/dalvikvm
 
 function find_libdir() {
@@ -52,11 +57,6 @@
   fi
 }
 
-PROG_NAME="$(follow_links "$BASH_SOURCE")"
-PROG_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
-ANDROID_BUILD_TOP="$(cd "${PROG_DIR}/../../../../" ; pwd -P)/"
-ANDROID_HOST_OUT=$PROG_DIR/..
-ANDROID_DATA=$PWD/android-data$$
 LD_LIBRARY_PATH=$ANDROID_HOST_OUT/"$(find_libdir)"
 
 mkdir -p $ANDROID_DATA/dalvik-cache/{x86,x86_64}