Update from https://crrev.com/309415

third_party/android_platform/development/scripts/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."""
 
 import getopt
 import glob
 import os
-import re
 import sys
 
 import stack_core
 import subprocess
 import symbol
 import sys
 
 DEFAULT_SYMROOT='/tmp/symbols'
 
 def PrintUsage():
   """Print usage and exit with error."""
   # pylint: disable-msg=C6310
   print
   print "  usage: " + sys.argv[0] + " [options] [FILE]"
   print
   print "  --symbols-dir=path"
-  print "       the path to a symbols dir, this is generally for system level"
-  print "       symbols"
+  print "       the path to a symbols dir, such as =/tmp/out/target/product/dream/symbols"
   print
-  print "  --mojo-symbols-dir=path"
-  print "       the path to a directory containing Mojo symbols (can be"
-  print "       absolute or relative to src), such as =out/android_Debug"
-  print "       If not specified, will look for the newest lib in "
-  print "       out/android_Debug or out/android_Release"
+  print "  --chrome-symbols-dir=path"
+  print "       the path to a Chrome symbols dir (can be absolute or relative"
+  print "       to src), such as =out/Debug/lib"
+  print "       If not specified, will look for the newest lib in out/Debug or"
+  print "       out/Release"
   print
   print "  --symbols-zip=path"
   print "       the path to a symbols zip file, such as =dream-symbols-12345.zip"
   print
   print "  --more-info"
   print "  --less-info"
   print "       Change the level of detail in the output."
   print "       --more-info is slower and more verbose, but more functions will"
   print "       be fully qualified with namespace/classname and have full"
   print "       argument information. Also, the 'stack data' section will be"
   print "       printed."
   print
-  print "  --arch=arm|arm64|x64|x86|mips"
+  print "  --arch=arm|arm64|x86_64|x86|mips"
   print "       the target architecture"
   print
   print "  FILE should contain a stack trace in it somewhere"
   print "       the tool will find that and re-print it with"
   print "       source files and line numbers.  If you don't"
   print "       pass FILE, or if file is -, it reads from"
   print "       stdin."
   print
   # pylint: enable-msg=C6310
   sys.exit(1)
@@ skipping 33 matching lines @@
   android_symbols = glob.glob("%s/out/target/product/*/symbols" % symdir)
   if android_symbols:
     return (symdir, android_symbols[0])
   else:
     # This is a zip of Chrome symbols, so symbol.CHROME_SYMBOLS_DIR needs to be
     # updated to point here.
     symbol.CHROME_SYMBOLS_DIR = symdir
     return (symdir, symdir)
 
 
-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 GetSymbolMapping(lines):
-  """Returns a mapping (dictionary) from download file to .so."""
-  regex = re.compile('Caching mojo app (\S+) at (\S+)')
-  mappings = {}
-  for line in lines:
-    result = regex.search(line)
-    if result:
-      mappings[result.group(2)] = GetBasenameFromMojoApp(result.group(1))
-  return mappings
-
-
 def main():
   try:
     options, arguments = getopt.getopt(sys.argv[1:], "",
                                        ["more-info",
                                         "less-info",
-                                        "mojo-symbols-dir=",
+                                        "chrome-symbols-dir=",
                                         "symbols-dir=",
                                         "symbols-zip=",
                                         "arch=",
                                         "help"])
   except getopt.GetoptError, unused_error:
     PrintUsage()
 
   zip_arg = None
   more_info = False
   for option, value in options:
     if option == "--help":
       PrintUsage()
     elif option == "--symbols-dir":
       symbol.SYMBOLS_DIR = os.path.expanduser(value)
     elif option == "--symbols-zip":
       zip_arg = os.path.expanduser(value)
     elif option == "--arch":
       symbol.ARCH = value
-    elif option == "--mojo-symbols-dir":
+    elif option == "--chrome-symbols-dir":
       symbol.CHROME_SYMBOLS_DIR = os.path.join(symbol.CHROME_SYMBOLS_DIR, value)
     elif option == "--more-info":
       more_info = True
     elif option == "--less-info":
       more_info = False
 
   if len(arguments) > 1:
     PrintUsage()
 
   if not arguments or arguments[0] == "-":
     print "Reading native crash info from stdin"
     f = sys.stdin
   else:
     print "Searching for native crashes in %s" % arguments[0]
     f = open(arguments[0], "r")
 
   lines = f.readlines()
   f.close()
 
   rootdir = None
   if zip_arg:
     rootdir, symbol.SYMBOLS_DIR = UnzipSymbols(zip_arg)
 
   print "Reading Android symbols from", symbol.SYMBOLS_DIR
   print "Reading Chrome symbols from", symbol.CHROME_SYMBOLS_DIR
-  stack_core.ConvertTrace(lines, more_info, GetSymbolMapping(lines))
+  stack_core.ConvertTrace(lines, more_info)
 
   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