Index: mojo/devtools/common/android_stack_parser/stack |
diff --git a/mojo/devtools/common/android_stack_parser/stack b/mojo/devtools/common/android_stack_parser/stack |
index 97913ab84191ed7e8d87219a50b702b28762815b..549bfb56afa1412671906ad5e0f06655e65c31e9 100755 |
--- a/mojo/devtools/common/android_stack_parser/stack |
+++ b/mojo/devtools/common/android_stack_parser/stack |
@@ -19,6 +19,7 @@ |
import getopt |
import glob |
import os |
+import os.path |
import re |
import sys |
@@ -133,13 +134,14 @@ def GetSymboledNameForMojoApp(path): |
def GetSymbolMapping(lines): |
"""Returns a mapping (dictionary) from download file to .so.""" |
ppi
2015/08/21 08:15:11
Would it be feasible to add a unittest for this pa
etiennej
2015/08/21 14:43:06
Done.
|
- regex = re.compile('Caching mojo app (\S+) at (\S+)') |
+ regex = re.compile('Caching mojo app (\S+?)(?:\?\S+)? at (\S+)') |
mappings = {} |
for line in lines: |
result = regex.search(line) |
if result: |
url = GetBasenameFromMojoApp(result.group(1)) |
- mappings[result.group(2)] = GetSymboledNameForMojoApp(url) |
+ mappings[os.path.normpath(result.group(2))] = GetSymboledNameForMojoApp( |
+ url) |
return mappings |