commit b76bc78ed20629966f4358b2031e75897d616d53
author Nicolas Geoffray <ngeoffray@google.com> Wed Sep 14 12:33:34 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Sep 15 10:55:08 2016 +0100
tree 7d78d94551dfb83f2d5c0aaca5f451392892c7a4
parent e305eaf2c08a203e3e046c3a8608b90b9dc5a080

Revert "Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC."""

This reverts commit 8522758c5ef6050e355613630ff81c2b49373b44.

Change-Id: Ie18417bd3d528673e3da39d92f43f20b853facda

tools/art

diff --git a/tools/art b/tools/art
index 1a3bba7..1394a46 100644
--- a/tools/art
+++ b/tools/art
@@ -100,7 +100,7 @@
   $invoke_with $ANDROID_ROOT/bin/$DALVIKVM $lib \
     -XXlib:$LIBART \
     -Xnorelocate \
-    -Ximage:$ANDROID_ROOT/framework/core-optimizing-pic.art \
+    -Ximage:$ANDROID_ROOT/framework/core.art \
     $DEBUG_OPTION \
     "$@"