diff options
| author | Andreas Gampe <agampe@google.com> | 2014-04-18 17:11:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-18 17:11:36 +0000 |
| commit | 44b0053fdb7ad8a30138d29f714172a7dc69efb8 (patch) | |
| tree | 26391df43c388c602fd341d25be33b5ebf82425a | |
| parent | ec83aacf669165eeeb1c30aee402001394982fd3 (diff) | |
| parent | e400aa24efc40d1f2616586b9514f58a83a7f332 (diff) | |
| download | android_art-44b0053fdb7ad8a30138d29f714172a7dc69efb8.tar.gz android_art-44b0053fdb7ad8a30138d29f714172a7dc69efb8.tar.bz2 android_art-44b0053fdb7ad8a30138d29f714172a7dc69efb8.zip | |
Merge "Fix elf_writer_test for 64b target"
| -rw-r--r-- | compiler/elf_writer_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/elf_writer_test.cc b/compiler/elf_writer_test.cc index 8175c35077..864dadc963 100644 --- a/compiler/elf_writer_test.cc +++ b/compiler/elf_writer_test.cc @@ -50,7 +50,11 @@ 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 } LOG(INFO) << "elf_filename=" << elf_filename; |