Add --output-dir flag to third_party/android_platform/development/scripts/stack

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 logging
 import os
 import sys
 
 import stack_core
 import stack_libs
 import subprocess
 import symbol
 import sys
 

[rmcilroy, 2016/02/03 12:35:39]

Please update src/third_party/android_platform/README.chromium with a line
mentioning these changes.

[agrieve, 2016/02/03 20:27:17]

Done.

+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

[rmcilroy, 2016/02/03 12:35:39]

I'd rather not do this. Since this script comes from the Android tree I'd rather
keep it self contained wherever possible. Could we add this check without
importing build/android/constants?

[agrieve, 2016/02/03 20:27:17]

We already import constants within symbol.py, so it makes sense to use the same
logic here I think.

[rmcilroy, 2016/02/04 11:36:42]

You are right, ok.

+
+
 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 "       If not specified, will look for the newest lib in out/Debug or"
-  print "       out/Release"
+  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"
@@ skipping 72 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()
 
+  constants.require_explicit_output_dir = True
+
   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 symbol.CHROME_SYMBOLS_DIR and not chrome_apk_dir:
     chrome_apk_dir = os.path.join(symbol.CHROME_SYMBOLS_DIR,
                                   '..', DEFAULT_APK_DIR)
 
   if len(arguments) > 1:
     PrintUsage()
 
+  # Do an up-front test that the output directory is known.
+  constants.GetOutDirectory()
+
   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()
 
@@ skipping 39 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__":
   sys.exit(main(sys.argv[1:]))
 
 # vi: ts=2 sw=2