Merge "Art script: Use PWD for android-data and cleanup after running."

1 files changed, 7 insertions, 4 deletions

diff --git a/tools/art b/tools/art
index aa53a39901..c9c0d4fe59 100755
--- a/tools/art
+++ b/tools/art
@@ -46,12 +46,15 @@ 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$$
 
-mkdir -p /tmp/android-data/dalvik-cache
-ANDROID_DATA=/tmp/android-data \
+mkdir -p $ANDROID_DATA/dalvik-cache
+ANDROID_DATA=$ANDROID_DATA \
   ANDROID_ROOT=$ANDROID_HOST_OUT \
   LD_LIBRARY_PATH=$ANDROID_HOST_OUT/lib \
-  exec $invoke_with $ANDROID_HOST_OUT/bin/dalvikvm $lib \
-    -Xbootclasspath:$ANDROID_HOST_OUT/core-hostdex.jar \
+  $invoke_with $ANDROID_HOST_OUT/bin/dalvikvm $lib \
     -Ximage:$ANDROID_HOST_OUT/framework/core.art \
      "$@"
+EXIT_STATUS=$?
+rm -rf $ANDROID_DATA
+exit $EXIT_STATUS