commit 2afe49450f2e018f18b5de45428b9174bfd6f196
author Brian Carlstrom <bdc@google.com> Mon May 19 10:25:33 2014 -0700
committer Brian Carlstrom <bdc@google.com> Mon May 19 10:26:17 2014 -0700
tree 2d6f96d2dfc4c8baaef172259a824708e510225e
parent 84e524207b23d58a1b1e5f4443000ccac97c4184

Follow up to "Add ISA directory to image and odex pathnames."

Change-Id: I7f08cc3052fbed93a56ccf1ab7675ae8bc129da9

compiler/elf_writer_test.cc

diff --git a/compiler/elf_writer_test.cc b/compiler/elf_writer_test.cc
index dd7ef2a..d7de6f0 100644
--- a/compiler/elf_writer_test.cc
+++ b/compiler/elf_writer_test.cc
@@ -44,15 +44,15 @@
   } while (false)
 
 TEST_F(ElfWriterTest, dlsym) {
-  std::string elf_filename;
+  std::string elf_location;
   if (IsHost()) {
     const char* host_dir = getenv("ANDROID_HOST_OUT");
     CHECK(host_dir != NULL);
-    elf_filename = StringPrintf("%s/framework/core.oat", host_dir);
+    elf_location = StringPrintf("%s/framework/core.oat", host_dir);
   } else {
-    elf_filename = "/data/art-test/core.oat";
+    elf_location = "/data/art-test/core.oat";
   }
-  elf_filename = GetSystemImageFilename(elf_filename.c_str(), kRuntimeISA);
+  std::string elf_filename = GetSystemImageFilename(elf_location.c_str(), kRuntimeISA);
   LOG(INFO) << "elf_filename=" << elf_filename;
 
   UnreserveImageSpace();