diff options
| author | 2016-02-17 17:46:30 +0000 | |
|---|---|---|
| committer | 2016-02-17 17:46:31 +0000 | |
| commit | f0b04803ec4cdd8d76aadb6f02ae2511c46b20b5 (patch) | |
| tree | 90390c57c73168102a2c1aaa3c6d828115e33b17 /compiler/oat_test.cc | |
| parent | 9ee1f0c6a67729cabcf3697fc68fe4e98da55f64 (diff) | |
| parent | 45724f9a0cc38dbb3071beb3eeab96499868b49c (diff) | |
Merge "Revert "Allow method references across oat files for multi-image.""
Diffstat (limited to 'compiler/oat_test.cc')
| -rw-r--r-- | compiler/oat_test.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index d03b4f1055..894d29ee99 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -111,16 +111,17 @@ class OatTest : public CommonCompilerTest { compiler_kind, insn_set, insn_features_.get(), - /* boot_image */ false, - /* image_classes */ nullptr, - /* compiled_classes */ nullptr, - /* compiled_methods */ nullptr, - /* thread_count */ 2, - /* dump_stats */ true, - /* dump_passes */ true, + false, + nullptr, + nullptr, + nullptr, + 2, + true, + true, timer_.get(), - /* swap_fd */ -1, - /* profile_compilation_info */ nullptr)); + -1, + nullptr, + nullptr)); } bool WriteElf(File* file, @@ -200,10 +201,6 @@ class OatTest : public CommonCompilerTest { class_linker->RegisterDexFile(*dex_file, runtime->GetLinearAlloc()); } oat_writer.PrepareLayout(compiler_driver_.get(), nullptr, dex_files); - size_t rodata_size = oat_writer.GetOatHeader().GetExecutableOffset(); - size_t text_size = oat_writer.GetSize() - rodata_size; - elf_writer->SetLoadedSectionSizes(rodata_size, text_size, oat_writer.GetBssSize()); - if (!oat_writer.WriteRodata(rodata)) { return false; } @@ -219,6 +216,7 @@ class OatTest : public CommonCompilerTest { return false; } + elf_writer->SetBssSize(oat_writer.GetBssSize()); elf_writer->WriteDynamicSection(); elf_writer->WriteDebugInfo(oat_writer.GetMethodDebugInfo()); elf_writer->WritePatchLocations(oat_writer.GetAbsolutePatchLocations()); |