commit b5d461dcae6f61136452ee41e16e4a6237b281a1
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 24 10:47:41 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Apr 02 09:55:21 2014 +0100
tree 86d1b11add7aabad6f85c8b713f8ca1010ed6515
parent c6a926398c25da1c00dd526628c48ddba1792008

Dalvik script: Use PWD for android-data and cleanup after running.

Change-Id: I0c8940c77184a40c4c20c7c369f1a8a36624ccb6

vm/dalvik

diff --git a/vm/dalvik b/vm/dalvik
index cf212fc..f5fae00 100644
--- a/vm/dalvik
+++ b/vm/dalvik
@@ -26,14 +26,15 @@
 PROG_NAME="$(follow_links "$BASH_SOURCE")"
 PROG_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
 ANDROID_BUILD_TOP="$(cd "${PROG_DIR}/../../../../" ; pwd -P)/"
+ANDROID_DATA=$PWD/android-data$$
 
-mkdir -p /tmp/android-data/dalvik-cache
+mkdir -p $ANDROID_DATA/dalvik-cache
 ANDROID_PRINTF_LOG=tag \
 ANDROID_LOG_TAGS="" \
-ANDROID_DATA=/tmp/android-data \
+ANDROID_DATA=$ANDROID_DATA \
 ANDROID_ROOT=$ANDROID_BUILD_TOP/out/host/linux-x86 \
 LD_LIBRARY_PATH=$ANDROID_BUILD_TOP/out/host/linux-x86/lib \
-exec $ANDROID_BUILD_TOP/out/host/linux-x86/bin/dalvikvm \
+$ANDROID_BUILD_TOP/out/host/linux-x86/bin/dalvikvm \
 -Xbootclasspath\
 :$ANDROID_BUILD_TOP/out/host/linux-x86/framework/core-hostdex.jar\
 :$ANDROID_BUILD_TOP/out/host/linux-x86/framework/conscrypt-hostdex.jar\
@@ -41,4 +42,6 @@
 :$ANDROID_BUILD_TOP/out/host/linux-x86/framework/bouncycastle-hostdex.jar\
 :$ANDROID_BUILD_TOP/out/host/linux-x86/framework/apache-xml-hostdex.jar \
 $*
-
+EXIT_STATUS=$?
+rm -rf $ANDROID_DATA
+exit $EXIT_STATUS