Merge "Add support for xxx.so!xxx.so lines." am: 197cd3d795 am: dc6db11f99

Change-Id: I5e6abe72c0236889928770d600600d8f2b9499af
This commit is contained in:
Automerger Merge Worker
2020-02-01 04:42:28 +00:00

View File

@@ -373,6 +373,14 @@ class TraceConverter:
apk = None apk = None
if area.endswith(".apk"): if area.endswith(".apk"):
apk = area apk = area
else:
index = area.rfind(".so!")
if index != -1:
# Sometimes we'll see something like:
# #01 pc abcd libart.so!libart.so (offset 0x134000)
# Remove everything after the ! and zero the offset value.
area = area[0:index + 3]
so_offset = 0
else: else:
index = area.rfind(".apk!") index = area.rfind(".apk!")
if index != -1: if index != -1: