From e679b779e6264a6963d5a43a5ac2c3945379275c Mon Sep 17 00:00:00 2001 From: "bulach@chromium.org" Date: Sat, 8 Feb 2014 02:24:16 +0000 Subject: Fixes android stack tool. Some logs may contain an empy file, which then gets converted to a directory. Test that the symbol file is actually a file. BUG=341979 Review URL: https://codereview.chromium.org/157913002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249899 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/android_platform/README.chromium | 1 + third_party/android_platform/development/scripts/symbol.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'third_party') diff --git a/third_party/android_platform/README.chromium b/third_party/android_platform/README.chromium index 4212f78..3db9f23 100644 --- a/third_party/android_platform/README.chromium +++ b/third_party/android_platform/README.chromium @@ -14,3 +14,4 @@ Android Platform engineering tools, specifically stack symbolization scripts. Local Modifications: Only picked the few scripts needed by chrome. Updated output directories to use environment variable. +When calling addr2line, check the symbol is a file (and not a directory). diff --git a/third_party/android_platform/development/scripts/symbol.py b/third_party/android_platform/development/scripts/symbol.py index 9dec19c..9eb24849 100755 --- a/third_party/android_platform/development/scripts/symbol.py +++ b/third_party/android_platform/development/scripts/symbol.py @@ -242,7 +242,7 @@ def CallAddr2LineForSet(lib, unique_addrs): symbols = SYMBOLS_DIR + lib - if not os.path.exists(symbols): + if not os.path.isfile(symbols): return None (label, platform, target) = FindToolchain() -- cgit v1.1