diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-12-29 13:17:37 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2016-01-06 10:17:01 -0800 |
| commit | ea0831f60d26e3297e6463634a9fbb6384f00661 (patch) | |
| tree | 6b970dced071048d59d1857e4703521d76566f99 /patchoat | |
| parent | 664d7cfba0e734ba8917c260e424ea559b7e8f9f (diff) | |
| download | android_art-ea0831f60d26e3297e6463634a9fbb6384f00661.tar.gz android_art-ea0831f60d26e3297e6463634a9fbb6384f00661.tar.bz2 android_art-ea0831f60d26e3297e6463634a9fbb6384f00661.zip | |
Re-enable adding intern table to image
Changed intern table to have a stack of tables similarily to
ClassTable. Adding an image intern table adds to the front of the
intern table stack. Also some cleanup.
Bug: 26317072
Change-Id: I7bbf9485b5dbbbf3707fed21e29de3beccfb8705
Diffstat (limited to 'patchoat')
| -rw-r--r-- | patchoat/patchoat.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index 3037652c4c..d836532ed2 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -540,7 +540,7 @@ void PatchOat::PatchInternedStrings(const ImageHeader* image_header) { // Note that we require that ReadFromMemory does not make an internal copy of the elements. // This also relies on visit roots not doing any verification which could fail after we update // the roots to be the image addresses. - temp_table.ReadFromMemory(image_->Begin() + section.Offset()); + temp_table.AddTableFromMemory(image_->Begin() + section.Offset()); FixupRootVisitor visitor(this); temp_table.VisitRoots(&visitor, kVisitRootFlagAllRoots); } |