commit 0eb76d2603a52d3e8759fcf480586886d70433d1
author Alex Light <allight@google.com> Tue Aug 11 18:03:47 2015 -0700
committer Alex Light <allight@google.com> Fri Aug 14 19:34:57 2015 +0000
tree 8d38a89d6de7be77c437c9df12bf646b793ba639
parent 4500fcbe682d666a24c2e8f6e0cb90cfb35d3fa3

Make patchoat match offset when given a patched image

Previously if we gave patchoat a patched image and a already patched
(but improperly relocated) oat file it would not correctly patch the
oat file to the same offset as the image.

Bug: 22599792
Bug: 23119724
Change-Id: I8773022bd75c2e0b7eb529893b147cbd8792bcad

runtime/elf_file.h

diff --git a/runtime/elf_file.h b/runtime/elf_file.h
index 48cb4b8..1188c97 100644
--- a/runtime/elf_file.h
+++ b/runtime/elf_file.h
@@ -60,7 +60,7 @@
 
   const File& GetFile() const;
 
-  bool GetSectionOffsetAndSize(const char* section_name, uint64_t* offset, uint64_t* size);
+  bool GetSectionOffsetAndSize(const char* section_name, uint64_t* offset, uint64_t* size) const;
 
   uint64_t FindSymbolAddress(unsigned section_type,
                              const std::string& symbol_name,