commit 67e1dc5ae1357de26039151a61ad2599ef21de2f
author Richard Uhler <ruhler@google.com> Mon Feb 06 16:50:17 2017 +0000
committer Richard Uhler <ruhler@google.com> Wed Feb 15 10:47:27 2017 +0000
tree b97a67fee4d3461ec28722fee477ab91cf390361
parent e92ba687f9ab2a3cd9724f494b6899e8e6e472ec

Remove use of npic image for gtests.

Test: art gtests on host and target
Bug: 33192586
Change-Id: Ic56e304eb539b4cf353281280a48ce23c74bf218

runtime/common_runtime_test.cc

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