commit 0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53
author Brian Carlstrom <bdc@google.com> Wed May 14 17:44:28 2014 -0700
committer Brian Carlstrom <bdc@google.com> Fri May 16 16:14:50 2014 -0700
tree aba31f1d671b4816fb63fca00b985ab0d2b6a12b
parent de1129a26e0474ea8bb9112938ebb867163969fd

Add ISA directory to image and odex pathnames.

Bug: 14882223
Bug: 14694978
Change-Id: Ic1b5ae836b8e91ea461dcd4f3da8e38dc3bec00f

compiler/elf_writer_test.cc

diff --git a/compiler/elf_writer_test.cc b/compiler/elf_writer_test.cc
index 864dadc..dd7ef2a 100644
--- a/compiler/elf_writer_test.cc
+++ b/compiler/elf_writer_test.cc
@@ -50,12 +50,9 @@
     CHECK(host_dir != NULL);
     elf_filename = StringPrintf("%s/framework/core.oat", host_dir);
   } else {
-#ifdef __LP64__
-    elf_filename = "/data/art-test64/core.oat";
-#else
     elf_filename = "/data/art-test/core.oat";
-#endif
   }
+  elf_filename = GetSystemImageFilename(elf_filename.c_str(), kRuntimeISA);
   LOG(INFO) << "elf_filename=" << elf_filename;
 
   UnreserveImageSpace();