summaryrefslogtreecommitdiff
path: root/runtime/common_runtime_test.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-09-15 11:42:30 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-09-15 11:42:30 +0000
commitfce42f486d9a607fb4fb472ec142a82ceccb6b5f (patch)
tree393cd58ff2c57f136abf245f2c1d10e6421ba2e0 /runtime/common_runtime_test.cc
parent6f41ec68d3a3fae7bcd9ebd70b39b60e954449f3 (diff)
parentb76bc78ed20629966f4358b2031e75897d616d53 (diff)
Merge "Revert "Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC.""""
Diffstat (limited to 'runtime/common_runtime_test.cc')
-rw-r--r--runtime/common_runtime_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index dba0a81125..5bc4e88107 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -591,9 +591,9 @@ std::string CommonRuntimeTestImpl::GetCoreFileLocation(const char* suffix) {
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;