commit f82baa912a4c05a39f953826a45c0617dd2e78ff
author Nicolas Geoffray <ngeoffray@google.com> Tue Oct 06 11:26:13 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 06 11:26:13 2015 +0000
tree 66a277543bf65502577645d73d0ed84426e629c6
parent 7b5c395e9a50f988ca2275a429df17b6abbcc475
parent 1e085f0a04d4173d4b546b830c99f4477363f495

Merge "Use optimizing's pic boot image in art script."

tools/art

diff --git a/tools/art b/tools/art
index 676d6ae..304a9d0 100644
--- a/tools/art
+++ b/tools/art
@@ -89,6 +89,7 @@
   invoke_with="perf record -o $ANDROID_DATA/perf.data -e cycles:u $invoke_with"
 fi
 
+# We use the PIC core image to work with perf.
 ANDROID_DATA=$ANDROID_DATA \
   ANDROID_ROOT=$ANDROID_ROOT \
   LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
@@ -97,7 +98,7 @@
   $invoke_with $ANDROID_ROOT/bin/$DALVIKVM $lib \
     -XXlib:$LIBART \
     -Xnorelocate \
-    -Ximage:$ANDROID_ROOT/framework/core.art \
+    -Ximage:$ANDROID_ROOT/framework/core-optimizing-pic.art \
     -Xcompiler-option --generate-debug-info \
     "$@"