diff options
author | Christopher Ferris <cferris@google.com> | 2013-12-12 12:56:16 -0800 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2013-12-12 12:56:16 -0800 |
commit | 65a69446d3f9886815fbd49fe07b338b045e922b (patch) | |
tree | 7ae234631694f4aa7dc99e44d3658d9adc1d2352 /tools/adbs | |
parent | 8a373fd5aef4eafbd716abe517a99ef0b3d69094 (diff) | |
download | build-65a69446d3f9886815fbd49fe07b338b045e922b.zip build-65a69446d3f9886815fbd49fe07b338b045e922b.tar.gz build-65a69446d3f9886815fbd49fe07b338b045e922b.tar.bz2 |
Fix regex for finding symbol data.
The new output of debuggerd removed a space between the #00 and the rest
of the line. The regex is very restrictive, so fixing it to handle the new
output.
Change-Id: I5259ae1e56a351608b330dfd858a2021e6d89358
Diffstat (limited to 'tools/adbs')
-rwxr-xr-x | tools/adbs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -20,9 +20,9 @@ import string import sys ############################################################################### -# match "#00 pc 0003f52e /system/lib/libdvm.so" for example +# match "#00 pc 0003f52e /system/lib/libdvm.so" for example ############################################################################### -trace_line = re.compile("(.*)(\#[0-9]+) (..) ([0-9a-f]{8}) ([^\r\n \t]*)") +trace_line = re.compile("(.*)(\#[0-9]+) {1,2}(..) ([0-9a-f]{8}) ([^\r\n \t]*)") # returns a list containing the function name and the file/lineno def CallAddr2Line(lib, addr): |