diff options
| -rwxr-xr-x | scripts/stack_core.py | 16 | ||||
| -rwxr-xr-x | scripts/symbol.py | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/scripts/stack_core.py b/scripts/stack_core.py index 42285d462..28a59774e 100755 --- a/scripts/stack_core.py +++ b/scripts/stack_core.py @@ -66,6 +66,11 @@ def ConvertTrace(lines): thread_line = re.compile("(.*)(\-\-\- ){15}\-\-\-") dalvik_jni_thread_line = re.compile("(\".*\" prio=[0-9]+ tid=[0-9]+ NATIVE.*)") dalvik_native_thread_line = re.compile("(\".*\" sysTid=[0-9]+ nice=[0-9]+.*)") + + width = "{8}" + if symbol.ARCH == "arm64" or symbol.ARCH == "x86_64": + width = "{16}" + # Note that both trace and value line matching allow for variable amounts of # whitespace (e.g. \t). This is because the we want to allow for the stack # tool to operate on AndroidFeedback provided system logs. AndroidFeedback @@ -77,13 +82,13 @@ def ConvertTrace(lines): # Or lines from AndroidFeedback crash report system logs like: # 03-25 00:51:05.520 I/DEBUG ( 65): #00 pc 001cf42e /data/data/com.my.project/lib/libmyproject.so # Please note the spacing differences. - trace_line = re.compile("(.*)\#([0-9]+)[ \t]+(..)[ \t]+([0-9a-f]{8})[ \t]+([^\r\n \t]*)( \((.*)\))?") # pylint: disable-msg=C6310 + trace_line = re.compile("(.*)\#([0-9]+)[ \t]+(..)[ \t]+([0-9a-f]" + width + ")[ \t]+([^\r\n \t]*)( \((.*)\))?") # pylint: disable-msg=C6310 # Examples of matched value lines include: # bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so # bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so (symbol) # 03-25 00:51:05.530 I/DEBUG ( 65): bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so # Again, note the spacing differences. - value_line = re.compile("(.*)([0-9a-f]{8})[ \t]+([0-9a-f]{8})[ \t]+([^\r\n \t]*)( \((.*)\))?") + value_line = re.compile("(.*)([0-9a-f]" + width + ")[ \t]+([0-9a-f]" + width + ")[ \t]+([^\r\n \t]*)( \((.*)\))?") # Lines from 'code around' sections of the output will be matched before # value lines because otheriwse the 'code around' sections will be confused as # value lines. @@ -91,7 +96,12 @@ def ConvertTrace(lines): # Examples include: # 801cf40c ffffc4cc 00b2f2c5 00b2f1c7 00c1e1a8 # 03-25 00:51:05.530 I/DEBUG ( 65): 801cf40c ffffc4cc 00b2f2c5 00b2f1c7 00c1e1a8 - code_line = re.compile("(.*)[ \t]*[a-f0-9]{8}[ \t]*[a-f0-9]{8}[ \t]*[a-f0-9]{8}[ \t]*[a-f0-9]{8}[ \t]*[a-f0-9]{8}[ \t]*[ \r\n]") # pylint: disable-msg=C6310 + code_line = re.compile("(.*)[ \t]*[a-f0-9]" + width + + "[ \t]*[a-f0-9]" + width + + "[ \t]*[a-f0-9]" + width + + "[ \t]*[a-f0-9]" + width + + "[ \t]*[a-f0-9]" + width + + "[ \t]*[ \r\n]") # pylint: disable-msg=C6310 trace_lines = [] value_lines = [] diff --git a/scripts/symbol.py b/scripts/symbol.py index a285fac11..8c1fa68de 100755 --- a/scripts/symbol.py +++ b/scripts/symbol.py @@ -79,7 +79,12 @@ def FindToolchain(): return TOOLCHAIN_INFO ## Known toolchains, newer ones in the front. - if ARCH == "arm": + if ARCH == "arm64": + gcc_version = os.environ["TARGET_GCC_VERSION"] + known_toolchains = [ + ("aarch64-linux-android-" + gcc_version, "aarch64", "aarch64-linux-android") + ] + elif ARCH == "arm": gcc_version = os.environ["TARGET_GCC_VERSION"] known_toolchains = [ ("arm-linux-androideabi-" + gcc_version, "arm", "arm-linux-androideabi"), @@ -101,6 +106,7 @@ def FindToolchain(): toolchain_info = (label, platform, target); if os.path.exists(ToolPath("addr2line", toolchain_info)): TOOLCHAIN_INFO = toolchain_info + print "Using toolchain from :" + ToolPath("", TOOLCHAIN_INFO) return toolchain_info raise Exception("Could not find tool chain") |