Merge "Fix GetMappingFromOffset" am: 0d2f6425ed am: 9e068aa334

am: 31a466e8f6 Change-Id: Ie426149513a2d93078b45fbae583fa06fac8982b
2018-08-03 17:20:12 -07:00
parent 4067d8feba 31a466e8f6
commit d5e817a29c
1 changed files with 5 additions and 1 deletions
--- a/scripts/native_heapdump_viewer.py
+++ b/scripts/native_heapdump_viewer.py
@@ -198,8 +198,12 @@ def GetMappingFromOffset(mapping, app_symboldir):
              + len(file_info.comment))
          end_offset = data_offset + file_info.file_size
          if mapping.offset >= data_offset and mapping.offset < end_offset:
+            # Round up the data_offset to the nearest page since the .so must be aligned.
+            so_file_alignment = 4096
+            data_offset += so_file_alignment - 1;
+            data_offset -= data_offset % so_file_alignment;
            mapping.name = file_info.filename
-            mapping.offset = data_offset - mapping.offset
+            mapping.offset -= data_offset
            break
  return mapping