Fix tools/android_stack_parser/stack and use it in skydb

tools/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
 #
@@ skipping 100 matching lines @@
 
 
 def GetBasenameFromMojoApp(url):
   """Used by GetSymbolMapping() to extract the basename from the location the
   mojo app was downloaded from. The location is a URL, e.g.
   http://foo/bar/x.so."""
   index = url.rfind('/')
   return url[(index + 1):] if index != -1 else url
 
 
+def GetSymboledNameForMojoApp(path):
+  """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."""
   regex = re.compile('Caching mojo app (\S+) at (\S+)')
+  # lib_mojo_shell.so moved to mojo_shell as part of building the APK
+  # currently this is the only library for which we do this.
+  # The install path of the apk can change every install, hence the regexp.
+  lib_mojo_regexp = re.compile(r'(/data/app/.*/libmojo_shell\.so)')
   mappings = {}
   for line in lines:
+    lib_mojo_result = lib_mojo_regexp.search(line)
+    if lib_mojo_result:
+      mappings[lib_mojo_result.group(1)] = 'mojo_shell'
+
     result = regex.search(line)
     if result:
-      mappings[result.group(2)] = GetBasenameFromMojoApp(result.group(1))
+      url = GetBasenameFromMojoApp(result.group(1))
+      mappings[result.group(2)] = GetSymboledNameForMojoApp(url)
   return mappings
 
 
 def main():
   try:
     options, arguments = getopt.getopt(sys.argv[1:], "",
                                        ["more-info",
                                         "less-info",
                                         "mojo-symbols-dir=",
                                         "symbols-dir=",
@@ skipping 45 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