diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-14 17:44:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-16 16:14:50 -0700 |
| commit | 0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53 (patch) | |
| tree | aba31f1d671b4816fb63fca00b985ab0d2b6a12b /compiler/elf_writer_test.cc | |
| parent | de1129a26e0474ea8bb9112938ebb867163969fd (diff) | |
| download | android_art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.tar.gz android_art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.tar.bz2 android_art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.zip | |
Add ISA directory to image and odex pathnames.
Bug: 14882223
Bug: 14694978
Change-Id: Ic1b5ae836b8e91ea461dcd4f3da8e38dc3bec00f
Diffstat (limited to 'compiler/elf_writer_test.cc')
| -rw-r--r-- | compiler/elf_writer_test.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/elf_writer_test.cc b/compiler/elf_writer_test.cc index 864dadc963..dd7ef2a482 100644 --- a/compiler/elf_writer_test.cc +++ b/compiler/elf_writer_test.cc @@ -50,12 +50,9 @@ TEST_F(ElfWriterTest, dlsym) { 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(); |