Revert of Add --output-directory to stack tool buildbot step

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 import collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 612 matching lines @@
           'gs://%s' % gs_path])
   bb_annotations.PrintLink('logcat dump', '%s/%s' % (GS_AUTH_URL, gs_path))
 
 
 def RunStackToolSteps(options):
   """Run stack tool steps.
 
   Stack tool is run for logcat dump, optionally for ASAN.
   """
   bb_annotations.PrintNamedStep('Run stack tool with logcat dump')
-  build_dir = os.path.join(CHROME_OUT_DIR, options.target)
-  logcat_file = os.path.join(build_dir, 'full_log.txt')
+  logcat_file = os.path.join(CHROME_OUT_DIR, options.target, 'full_log.txt')
   RunCmd([os.path.join(CHROME_SRC_DIR, 'third_party', 'android_platform',
           'development', 'scripts', 'stack'),
-          '--more-info', logcat_file,
-          '--output-directory', build_dir])
+          '--more-info', logcat_file])
   if options.asan_symbolize:
     bb_annotations.PrintNamedStep('Run stack tool for ASAN')
     RunCmd([
         os.path.join(CHROME_SRC_DIR, 'build', 'android', 'asan_symbolize.py'),
-        '-l', logcat_file,
-        '--output-directory', build_dir])
+        '-l', logcat_file])
 
 
 def GenerateTestReport(options):
   bb_annotations.PrintNamedStep('test_report')
   for report in glob.glob(
       os.path.join(CHROME_OUT_DIR, options.target, 'test_logs', '*.log')):
     RunCmd(['cat', report])
     os.remove(report)
 
 
@@ skipping 111 matching lines @@
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))