summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-01-18 16:57:06 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2016-01-18 16:57:06 +0000
commitdba4fe7d43f6cb29834e0720e0d15645dd6bce2a (patch)
treea7f8c38dd07520f94fe1743556f1fe98e10e98ec
parentb8bb9f6d0b59be125066f604f134155f8998f5ae (diff)
Pass --generate-debug-info only when --perf is passed.
Change-Id: I7ea275aced8c514d5a1b4ac979964481ef643eaa
-rw-r--r--tools/art4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/art b/tools/art
index 304a9d03f6..d91b4517f0 100644
--- a/tools/art
+++ b/tools/art
@@ -75,6 +75,7 @@ PROG_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
ANDROID_ROOT=$PROG_DIR/..
LIBDIR=$(find_libdir)
LD_LIBRARY_PATH=$ANDROID_ROOT/$LIBDIR
+DEBUG_OPTION=""
DELETE_ANDROID_DATA=false
# If ANDROID_DATA is the system ANDROID_DATA or is not set, use our own,
@@ -87,6 +88,7 @@ fi
if [ z"$PERF" != z ]; then
invoke_with="perf record -o $ANDROID_DATA/perf.data -e cycles:u $invoke_with"
+ DEBUG_OPTION="-Xcompiler-option --generate-debug-info"
fi
# We use the PIC core image to work with perf.
@@ -99,7 +101,7 @@ ANDROID_DATA=$ANDROID_DATA \
-XXlib:$LIBART \
-Xnorelocate \
-Ximage:$ANDROID_ROOT/framework/core-optimizing-pic.art \
- -Xcompiler-option --generate-debug-info \
+ $DEBUG_OPTION \
"$@"
EXIT_STATUS=$?