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

runtime/common_runtime_test.cc

diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index dba0a81..5bc4e88 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -591,9 +591,9 @@
   if (IsHost()) {
     const char* host_dir = getenv("ANDROID_HOST_OUT");
     CHECK(host_dir != nullptr);
-    location = StringPrintf("%s/framework/core.%s", host_dir, suffix);
+    location = StringPrintf("%s/framework/core-npic.%s", host_dir, suffix);
   } else {
-    location = StringPrintf("/data/art-test/core.%s", suffix);
+    location = StringPrintf("/data/art-test/core-npic.%s", suffix);
   }
 
   return location;