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

build/android/tombstones.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Find the most recent tombstone file(s) on all connected devices
 # and prints their stacks.
 #
 # Assumes tombstone file was created with current symbols.
 
 import datetime
 import logging
 import multiprocessing
 import os
 import re
 import subprocess
 import sys
 import optparse
 
 import devil_chromium
 
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_utils
 from devil.utils import run_tests_helper
+from pylib import constants
 
 _TZ_UTC = {'TZ': 'UTC'}
 
 def _ListTombstones(device):
   """List the tombstone files on the device.
 
   Args:
     device: An instance of DeviceUtils.
 
   Yields:
@@ skipping 85 matching lines @@
     found_abi = re.search('ABI: \'(.+?)\'', line)
     if found_abi:
       device_abi = found_abi.group(1)
   arch = _DeviceAbiToArch(device_abi)
   if not arch:
     return
 
   stack_tool = os.path.join(os.path.dirname(__file__), '..', '..',
                             'third_party', 'android_platform', 'development',
                             'scripts', 'stack')
+  # --output-directory is passed implicitly via the CHROMIUM_OUTPUT_DIR

[jbudorick, 2016/02/04 16:13:45]

nit: I'd prefer explicitly passing it on the command line.

[agrieve, 2016/02/04 18:30:50]

Done.

+  # environment variable.
   proc = subprocess.Popen([stack_tool, '--arch', arch], stdin=subprocess.PIPE,
                           stdout=subprocess.PIPE)
   output = proc.communicate(input='\n'.join(tombstone_data))[0]
   for line in output.split('\n'):
     if not include_stack and 'Stack Data:' in line:
       break
     yield line
 
 
 def _ResolveTombstone(tombstone):
@@ skipping 88 matching lines @@
                     help="""Resolve symbols for all tombstones, rather than just
                          the most recent""")
   parser.add_option('-s', '--stack', action='store_true',
                     help='Also include symbols for stack data')
   parser.add_option('-w', '--wipe-tombstones', action='store_true',
                     help='Erase all tombstones from device after processing')
   parser.add_option('-j', '--jobs', type='int',
                     default=4,
                     help='Number of jobs to use when processing multiple '
                          'crash stacks.')
+  parser.add_option('--output-directory',
+                    help='Path to the root build directory.')
   options, _ = parser.parse_args()
 
   devil_chromium.Initialize()
 
   blacklist = (device_blacklist.Blacklist(options.blacklist_file)
                if options.blacklist_file
                else None)
 
+  if options.output_directory:
+    constants.SetOutputDirectory(options.output_directory)
+
+  # Do an up-front test that the output directory is known.
+  constants.CheckOutDirectory()
+
   if options.device:
     devices = [device_utils.DeviceUtils(options.device)]
   else:
     devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
 
   # This must be done serially because strptime can hit a race condition if
   # used for the first time in a multithreaded environment.
   # http://bugs.python.org/issue7980
   tombstones = []
   for device in devices:
     tombstones += _GetTombstonesForDevice(device, options)
 
   _ResolveTombstones(options.jobs, tombstones)
 
 
 if __name__ == '__main__':
   sys.exit(main())