commit 5f926055cb88089d8ca27243f35a9dfd89d981f0
author Vladimir Marko <vmarko@google.com> Fri Sep 30 17:04:49 2016 +0000
committer Vladimir Marko <vmarko@google.com> Fri Sep 30 18:08:09 2016 +0100
tree 8d87d400e36301eb648e19bcd225f13c469648ad
parent 9e5739aaa690a8529c104f4c05035a657616c310

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

oatdump/oatdump.cc

diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index f2062c3..f3f418d 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -154,11 +154,8 @@
     if (isa == kMips || isa == kMips64) {
       builder_->WriteMIPSabiflagsSection();
     }
-    builder_->PrepareDynamicSection(elf_file->GetPath(),
-                                    rodata_size,
-                                    text_size,
-                                    oat_file_->BssSize(),
-                                    oat_file_->BssRootsOffset());
+    builder_->PrepareDynamicSection(
+        elf_file->GetPath(), rodata_size, text_size, oat_file_->BssSize());
     builder_->WriteDynamicSection();
 
     Walk();