diff options
| author | 2016-04-27 21:03:42 +0000 | |
|---|---|---|
| committer | 2016-04-28 15:18:10 -0700 | |
| commit | d23d7d145c86975acbcc75505b8a323337066ac0 (patch) | |
| tree | a62d4397dd54fa1ee65ce870e3c0b0b965f43868 /patchoat/patchoat.h | |
| parent | 85e47976a483844177eb486d6e501fa070fbe6e2 (diff) | |
Revert "Write conflict tables in image"
Some strange issues on angler.
This reverts commit cda9386add68d94697449c6cb08b356747e55c21.
(cherry picked from commit 8e2478d23e89a7022c93ddc608dcbba7b29b91e6)
Change-Id: Iffd25c5fb732ff72b58c787c107dc33c56f8c8d4
Diffstat (limited to 'patchoat/patchoat.h')
| -rw-r--r-- | patchoat/patchoat.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/patchoat/patchoat.h b/patchoat/patchoat.h index 3ef837fde9..510ff1e5be 100644 --- a/patchoat/patchoat.h +++ b/patchoat/patchoat.h @@ -117,8 +117,6 @@ class PatchOat { bool PatchImage(bool primary_image) SHARED_REQUIRES(Locks::mutator_lock_); void PatchArtFields(const ImageHeader* image_header) SHARED_REQUIRES(Locks::mutator_lock_); void PatchArtMethods(const ImageHeader* image_header) SHARED_REQUIRES(Locks::mutator_lock_); - void PatchImtConflictTables(const ImageHeader* image_header) - SHARED_REQUIRES(Locks::mutator_lock_); void PatchInternedStrings(const ImageHeader* image_header) SHARED_REQUIRES(Locks::mutator_lock_); void PatchClassTable(const ImageHeader* image_header) |