| commit | 44b0053fdb7ad8a30138d29f714172a7dc69efb8 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Apr 18 17:11:36 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Apr 18 17:11:36 2014 +0000 |
| tree | 26391df43c388c602fd341d25be33b5ebf82425a | |
| parent | ec83aacf669165eeeb1c30aee402001394982fd3 [diff] | |
| parent | e400aa24efc40d1f2616586b9514f58a83a7f332 [diff] |
Merge "Fix elf_writer_test for 64b target"
diff --git a/compiler/elf_writer_test.cc b/compiler/elf_writer_test.cc index 8175c35..864dadc 100644 --- a/compiler/elf_writer_test.cc +++ b/compiler/elf_writer_test.cc
@@ -50,7 +50,11 @@ 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;