[Android] Fix stack symbolization when packed relocations are on.

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
 #
@@ skipping 127 matching lines @@
   try:
     options, arguments = getopt.getopt(argv, "",
                                        ["packed-relocation-adjustments",
                                         "no-packed-relocation-adjustments",
                                         "more-info",
                                         "less-info",
                                         "chrome-symbols-dir=",
                                         "output-directory=",
                                         "symbols-dir=",
                                         "symbols-zip=",
+                                        "packed-lib=",
                                         "arch=",
                                         "fallback-monochrome",
                                         "verbose",
                                         "help"])
   except getopt.GetoptError, unused_error:
     PrintUsage()
 
   zip_arg = None
   more_info = False
-  packed_relocation_adjustments = "unknown"
   fallback_monochrome = False
   arch_defined = False
+  packed_libs = []
   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
       arch_defined = True
     elif option == "--chrome-symbols-dir":
       symbol.CHROME_SYMBOLS_DIR = os.path.join(symbol.CHROME_SRC, value)
     elif option == "--output-directory":
       constants.SetOutputDirectory(value)
-    elif option == "--packed-relocation-adjustments":
-      packed_relocation_adjustments = True
-    elif option == "--no-packed-relocation-adjustments":
-      packed_relocation_adjustments = False
+    elif option == "--packed-lib":
+      packed_libs.append(os.path.expanduser(value))
     elif option == "--more-info":
       more_info = True
     elif option == "--less-info":
       more_info = False
     elif option == "--fallback-monochrome":
       fallback_monochrome = True
     elif option == "--verbose":
       logging.basicConfig(level=logging.DEBUG)
+    elif option in (
+        '--packed-relocation-adjustments',
+        '--no-packed-relocation-adjustments'):
+      print ('--[no-]packed-relocation-adjustments options are deprecated. '
+             'Specify packed libs directory instead.')
 
   if len(arguments) > 1:
     PrintUsage()
 
   # Do an up-front test that the output directory is known.
   if not symbol.CHROME_SYMBOLS_DIR:
     constants.CheckOutputDirectory()
 
   if not arguments or arguments[0] == "-":
     print "Reading native crash info from stdin"
     f = sys.stdin
   else:
     print "Searching for native crashes in: " + os.path.realpath(arguments[0])
     f = open(arguments[0], "r")
 
   lines = f.readlines()
   f.close()
 
   rootdir = None
   if zip_arg:
     rootdir, symbol.SYMBOLS_DIR = UnzipSymbols(zip_arg)
 
-  if packed_relocation_adjustments == "unknown":
-    version = stack_libs.GetTargetAndroidVersionNumber(lines)
-    if version == None:
-      packed_relocation_adjustments = False
-      print ("Unknown Android release, "
-             + "consider --[no-]packed-relocation-adjustments options")
-    elif version >= _ANDROID_M_MAJOR_VERSION:
-      packed_relocation_adjustments = False
-    else:
-      packed_relocation_adjustments = True
-      print ("Pre-M Android release detected, "
-             + "added --packed-relocation-adjustments option")
-  else:
-    packed_relocation_adjustments = False
+  version = stack_libs.GetTargetAndroidVersionNumber(lines)
+  if version is None:
+    print ("Unknown Android release, "
+           "consider passing --packed-lib.")
+  elif version < _ANDROID_M_MAJOR_VERSION and not packed_libs:
+    print ("Pre-M Android release detected, "
+           "but --packed-lib not specified. Stack symbolization may fail.")
 
-  if packed_relocation_adjustments:
-    constants.CheckOutputDirectory()
-    stripped_libs_dir = constants.GetOutDirectory()
-    load_vaddrs = stack_libs.GetLoadVaddrs(stripped_libs_dir)
+  if (version is None or version < _ANDROID_M_MAJOR_VERSION) and packed_libs:
+    load_vaddrs = stack_libs.GetLoadVaddrs(stripped_libs=packed_libs)
   else:
     load_vaddrs = {}
 
   print ("Reading Android symbols from: "
          + os.path.normpath(symbol.SYMBOLS_DIR))
   chrome_search_path = symbol.GetLibrarySearchPaths()
   print ("Searching for Chrome symbols from within: "
          + ':'.join((os.path.normpath(d) for d in chrome_search_path)))
   stack_core.ConvertTrace(lines, load_vaddrs, more_info, fallback_monochrome,
                           arch_defined)
 
   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__":
   sys.exit(main(sys.argv[1:]))
 
 # vi: ts=2 sw=2