🌿 Fix stack tool when packed relocations exist and built with GN

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 17 matching lines @@
 import symbol
 import sys
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__),
                                 os.pardir, os.pardir, os.pardir, os.pardir,
                                 'build', 'android'))
 from pylib import constants
 
 
 DEFAULT_SYMROOT='/tmp/symbols'
-DEFAULT_APK_DIR='chrome_apk'
 # From: https://source.android.com/source/build-numbers.html
 _ANDROID_M_MAJOR_VERSION=6
 
 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, such as =/tmp/out/target/product/dream/symbols"
   print
   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 "       to src), such as =out/Debug/lib.unstripped"
   print
   print "  --output-directory=path"
   print "       the path to the build output directory, such as out/Debug."
   print "       Ignored if --chrome-symbols-dir is passed."
   print
   print "  --packed-relocation-adjustments"
   print "  --no-packed-relocation-adjustments"
   print "       turn packed relocation adjustment on and off (default is off)"
   print "       If running on pre-M Android and the stack trace appears to"
   print "       make no sense, try turning this feature on."
   print
-  print "  --chrome-apk-dir=path"
-  print "       the path to the APK staging dir (can be absolute or relative"
-  print "       to src), such as =out/Debug/chrome_apk"
-  print "       If not specified, uses =|chrome-symbols-dir|/../chrome_apk"
-  print "       Parses libraries here to find data for adjusting debuggerd"
-  print "       tombstones where relocations are packed."
-  print "       Enable/disable with --[no-]packed-relocation-adjustments."
-  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."
@@ skipping 56 matching lines @@
 
 
 def main(argv):
   try:
     options, arguments = getopt.getopt(argv, "",
                                        ["packed-relocation-adjustments",
                                         "no-packed-relocation-adjustments",
                                         "more-info",
                                         "less-info",
                                         "chrome-symbols-dir=",
-                                        "chrome-apk-dir=",
                                         "output-directory=",
                                         "symbols-dir=",
                                         "symbols-zip=",
                                         "arch=",
                                         "verbose",
                                         "help"])
   except getopt.GetoptError, unused_error:
     PrintUsage()
 
   zip_arg = None
   more_info = False
-  chrome_apk_dir = None
   packed_relocation_adjustments = "unknown"
   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 == "--chrome-symbols-dir":
       symbol.CHROME_SYMBOLS_DIR = os.path.join(symbol.CHROME_SRC, value)
-    elif option == "--chrome-apk-dir":
-      chrome_apk_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 == "--more-info":
       more_info = True
     elif option == "--less-info":
       more_info = False
     elif option == "--verbose":
       logging.basicConfig(level=logging.DEBUG)
 
   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 chrome_apk_dir:
-    # TODO(agrieve): This directory doesn't exist with GN.
-    probable_dir = os.path.join(constants.GetOutDirectory(), DEFAULT_APK_DIR)
-    if os.path.exists(probable_dir):
-      chrome_apk_dir = probable_dir
-
   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":
-    if chrome_apk_dir:
-      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")
+    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 = False
-
-  if packed_relocation_adjustments and not chrome_apk_dir:
+      packed_relocation_adjustments = True
+      print ("Pre-M Android release detected, "
+             + "added --packed-relocation-adjustments option")
+  else:
     packed_relocation_adjustments = False
-    print ("No APK directory given or defaulted, "
-           + "--packed-relocation-adjustments option ignored")
 
   if packed_relocation_adjustments:
-    print ("Reading Chrome APK library data from: "
-           + os.path.normpath(chrome_apk_dir))
-    load_vaddrs = stack_libs.GetLoadVaddrs(chrome_apk_dir)
+    constants.CheckOutputDirectory()
+    stripped_libs_dir = constants.GetOutDirectory()
+    load_vaddrs = stack_libs.GetLoadVaddrs(stripped_libs_dir)
   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)
 
   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