diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-02 16:25:12 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-02 16:25:12 +0100 |
| commit | 6354bb830cc9ccec61c6fd47580842a1b4673cd5 (patch) | |
| tree | 01ee42fbc39a0c378c32ab3cca15090272098068 /tools/art | |
| parent | 395fa7286ca2c6cd3dd55c0eab5b0f69dc063fb8 (diff) | |
| download | android_art-6354bb830cc9ccec61c6fd47580842a1b4673cd5.tar.gz android_art-6354bb830cc9ccec61c6fd47580842a1b4673cd5.tar.bz2 android_art-6354bb830cc9ccec61c6fd47580842a1b4673cd5.zip | |
Fix art script for 'clean' environments.
We need to define ANDROID_HOST_OUT in the script before using it.
Change-Id: I6b415d8de5fb6001bc579b013683957abb33f394
Diffstat (limited to 'tools/art')
| -rwxr-xr-x | tools/art | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -42,6 +42,11 @@ function follow_links() { 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 @@ function find_libdir() { 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} |