summaryrefslogtreecommitdiffstats
path: root/tools/art
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-12-12 13:52:00 +0000
committerNicolas Geoffray <ngeoffray@google.com>2014-12-12 13:52:00 +0000
commite099a610c6a3cfd6adb263a30cdfbbd6ddf51760 (patch)
treead3adc13aab6f1a61aca13d5204938c0acd4f4c5 /tools/art
parent6b1497421c7c81cb9bf2ce077f1ef3d8ac24cfcb (diff)
downloadart-e099a610c6a3cfd6adb263a30cdfbbd6ddf51760.tar.gz
art-e099a610c6a3cfd6adb263a30cdfbbd6ddf51760.tar.bz2
art-e099a610c6a3cfd6adb263a30cdfbbd6ddf51760.zip
Un-break --perf option to the art art script.
Change-Id: I5446751982cc33f27aa6785359b3eb3ba969f93e
Diffstat (limited to 'tools/art')
-rw-r--r--tools/art8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/art b/tools/art
index d5d546b4a..2408f9fe9 100644
--- a/tools/art
+++ b/tools/art
@@ -76,10 +76,6 @@ ANDROID_ROOT=$PROG_DIR/..
LIBDIR=$(find_libdir)
LD_LIBRARY_PATH=$ANDROID_ROOT/$LIBDIR
-if [ z"$PERF" != z ]; then
- invoke_with="perf record -o $ANDROID_DATA/perf.data -e cycles:u $invoke_with"
-fi
-
DELETE_ANDROID_DATA=false
# If ANDROID_DATA is the system ANDROID_DATA or is not set, use our own,
# and ensure we delete it at the end.
@@ -89,6 +85,10 @@ if [ "$ANDROID_DATA" = "/data" ] || [ "$ANDROID_DATA" = "" ]; then
DELETE_ANDROID_DATA=true
fi
+if [ z"$PERF" != z ]; then
+ invoke_with="perf record -o $ANDROID_DATA/perf.data -e cycles:u $invoke_with"
+fi
+
ANDROID_DATA=$ANDROID_DATA \
ANDROID_ROOT=$ANDROID_ROOT \
LD_LIBRARY_PATH=$LD_LIBRARY_PATH \