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

build/android/tombstones.py

Index: build/android/tombstones.py
diff --git a/build/android/tombstones.py b/build/android/tombstones.py
index a7bd6feae21e8d6c6926717724af5d1bbf3989e1..4f0eb4ae31b19f48ea8f2b72956b3b7d1abeff8a 100755
--- a/build/android/tombstones.py
+++ b/build/android/tombstones.py
@@ -24,6 +24,7 @@ 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'}
 
@@ -129,6 +130,8 @@ def _ResolveSymbols(tombstone_data, include_stack, device_abi):
   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
+  # environment variable.
   proc = subprocess.Popen([stack_tool, '--arch', arch], stdin=subprocess.PIPE,
                           stdout=subprocess.PIPE)
   output = proc.communicate(input='\n'.join(tombstone_data))[0]
@@ -237,6 +240,8 @@ def main():
                     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()
@@ -245,6 +250,13 @@ def main():
                if options.blacklist_file
                else None)
 
+  constants.require_explicit_output_dir = True
+  if options.output_directory:
+    constants.SetOutputDirectory(options.output_directory)
+
+  # Do an up-front test that the output directory is known.
+  constants.GetOutDirectory()
+
   if options.device:
     devices = [device_utils.DeviceUtils(options.device)]
   else: