diff options
| author | 2016-09-30 17:04:49 +0000 | |
|---|---|---|
| committer | 2016-09-30 18:08:09 +0100 | |
| commit | 5f926055cb88089d8ca27243f35a9dfd89d981f0 (patch) | |
| tree | 8d87d400e36301eb648e19bcd225f13c469648ad /compiler/image_test.cc | |
| parent | 9e5739aaa690a8529c104f4c05035a657616c310 (diff) | |
Revert "Store resolved Strings for AOT code in .bss."
There are some issues with oat_test64 on host and aosp_mips-eng.
Also reverts "compiler_driver: Fix build."
Bug: 20323084
Bug: 30627598
This reverts commit 63dccbbefef3014c99c22748d18befcc7bcb3b41.
This reverts commit 04a44135ace10123f059373691594ae0f270a8a4.
Change-Id: I568ba3e58cf103987fdd63c8a21521010a9f27c4
Diffstat (limited to 'compiler/image_test.cc')
| -rw-r--r-- | compiler/image_test.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 9e94b9d861..4689c9d300 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -263,10 +263,7 @@ void CompilationHelper::Compile(CompilerDriver* driver, oat_writer->PrepareLayout(driver, writer.get(), cur_dex_files, &patcher); size_t rodata_size = oat_writer->GetOatHeader().GetExecutableOffset(); size_t text_size = oat_writer->GetOatSize() - rodata_size; - elf_writer->PrepareDynamicSection(rodata_size, - text_size, - oat_writer->GetBssSize(), - oat_writer->GetBssRootsOffset()); + elf_writer->SetLoadedSectionSizes(rodata_size, text_size, oat_writer->GetBssSize()); writer->UpdateOatFileLayout(i, elf_writer->GetLoadedSize(), |