Improve android stack parser

mojo/devtools/common/android_stack_parser/stack

 #!/usr/bin/env python
 #
 # Copyright (C) 2013 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 """stack symbolizes native crash dumps."""

[ppi, 2015/08/21 08:15:11]

Does this patch fix https://github.com/domokit/devtools/issues/23 ?

If so, please add "fixes domokit/devtools#23" in the description.

[etiennej, 2015/08/21 14:43:07]

Done.

 
 import getopt
 import glob
 import os
+import os.path
 import re
 import sys
 
 import stack_core
 import subprocess
 import symbol
 
 _DEFAULT_SYMROOT = '/tmp/symbols'
 _DEFAULT_BUILD_DIR = 'out/android_Debug'
 _DEFAULT_NDK_DIR = 'third_party/android_tools/ndk'
@@ skipping 93 matching lines @@
   """Used by GetSymbolMapping to get the non-stripped library name for an
   installed mojo app."""
   # e.g. tracing.mojo -> libtracing_library.so
   name, ext = os.path.splitext(path)
   if ext != '.mojo':
     return path
   return 'lib%s_library.so' % name
 
 
 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 particular function illustrating
the fix?

[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
 
 
 def _LowestAncestorContainingRelpath(dir_path, relpath):
   """Returns the lowest ancestor dir of |dir_path| that contains |relpath|.
   """
   cur_dir_path = os.path.abspath(dir_path)
   while True:
     if os.path.exists(os.path.join(cur_dir_path, relpath)):
       return cur_dir_path
@@ skipping 93 matching lines @@
   if rootdir:
     # be a good citizen and clean up...os.rmdir and os.removedirs() don't work
     cmd = "rm -rf \"%s\"" % rootdir
     print "\ncleaning up (%s)" % cmd
     os.system(cmd)
 
 if __name__ == "__main__":
   main()
 
 # vi: ts=2 sw=2