From 65a69446d3f9886815fbd49fe07b338b045e922b Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 12 Dec 2013 12:56:16 -0800 Subject: [PATCH] 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 --- tools/adbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/adbs b/tools/adbs index 37c520ca8..a9bc7c205 100755 --- a/tools/adbs +++ b/tools/adbs @@ -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):