Fix stack tool for library in apk crashes

third_party/android_platform/development/scripts/stack

Index: third_party/android_platform/development/scripts/stack
diff --git a/third_party/android_platform/development/scripts/stack b/third_party/android_platform/development/scripts/stack
index 31b9d590da524ca611885695def5e8e4c573780f..c5a56c61e031fd1ba226ea958e3ce20cc9d9fba1 100755
--- a/third_party/android_platform/development/scripts/stack
+++ b/third_party/android_platform/development/scripts/stack
@@ -18,6 +18,7 @@
 
 import getopt
 import glob
+import logging
 import os
 import sys
 
@@ -57,6 +58,9 @@ def PrintUsage():
   print "  --arch=arm|arm64|x64|x86|mips"
   print "       the target architecture"
   print
+  print "  --verbose"
+  print "       enable extra logging, particularly for debugging failed symbolization"
+  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"
@@ -108,15 +112,16 @@ def UnzipSymbols(symbolfile, symdir=None):
     return (symdir, symdir)
 
 
-def main():
+def main(argv):
   try:
-    options, arguments = getopt.getopt(sys.argv[1:], "",
+    options, arguments = getopt.getopt(argv, "",
                                        ["more-info",
                                         "less-info",
                                         "chrome-symbols-dir=",
                                         "symbols-dir=",
                                         "symbols-zip=",
                                         "arch=",
+                                        "verbose",
                                         "help"])
   except getopt.GetoptError, unused_error:
     PrintUsage()
@@ -138,6 +143,8 @@ def main():
       more_info = True
     elif option == "--less-info":
       more_info = False
+    elif option == "--verbose":
+      logging.basicConfig(level=logging.DEBUG)

[rmcilroy, 2015/03/12 21:50:14]

maybe add a common prefix to the log output to make it easier to spot amongst
any stacktrace output?

 
   if len(arguments) > 1:
     PrintUsage()
@@ -167,6 +174,6 @@ def main():
     os.system(cmd)
 
 if __name__ == "__main__":
-  main()
+  sys.exit(main(sys.argv[1:]))
 
 # vi: ts=2 sw=2