commit 1ba223b2e6dab206b02613bc8b523553477fc4a0
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 12 14:24:36 2016 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon Sep 12 14:24:36 2016 +0100
tree 1816c620ba73357ecdbad8175a3de6b9f751232f
parent 87068b4782c184d1d2e5b99a640a0328ca1198f2

Squashed commit of the following:

commit 487bc26b726a839b2e46424ee3779ac3bb2033f6
Author: Nicolas Geoffray <ngeoffray@google.com>
Date:   Mon Sep 12 14:24:12 2016 +0100

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

    This reverts commit 8c9ccac080e98fc5f33ba940a1216e9c2cc079db.

commit cefadb4b835390b508ae1d2b899f39f3769a593a
Author: Nicolas Geoffray <ngeoffray@google.com>
Date:   Mon Sep 12 14:23:47 2016 +0100

    Revert "Update test and dependencies after boot image changes."

    This reverts commit 2a1a8d7fa450a8196a63afb3bf647b2bec723497.

Change-Id: I58731d845c1166406039a9b74c833d72a82c88fb

tools/run-libcore-tests.sh

diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 01c7f20..2a6e172 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -95,7 +95,7 @@
   if [[ "$1" == "--mode=device" ]]; then
     vogar_args="$vogar_args --device-dir=/data/local/tmp"
     vogar_args="$vogar_args --vm-command=/data/local/tmp/system/bin/art"
-    vogar_args="$vogar_args --vm-arg -Ximage:/data/art-test/core.art"
+    vogar_args="$vogar_args --vm-arg -Ximage:/data/art-test/core-optimizing.art"
     shift
   elif [[ "$1" == "--mode=host" ]]; then
     # We explicitly give a wrong path for the image, to ensure vogar