Make sure CHROMIUM_OUTPUT_DIR is set from runtest.py

scripts/slave/runtest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool used to run a Chrome test executable and process the output.
 
 This script is used by the buildbot slaves. It must be run from the outer
 build directory, e.g. chrome-release/build/.
 
@@ skipping 1839 matching lines @@
     options.build_dir = build_directory.GetBuildOutputDirectory()
 
     if options.pass_target and options.target:
       args.extend(['--target', options.target])
     if options.pass_build_dir:
       args.extend(['--build-dir', options.build_dir])
 
     # We will use this to accumulate overrides for the command under test,
     # That we may not need or want for other support commands.
     extra_env = {}
+    if not os.environ.get('CHROMIUM_OUTPUT_DIR') and options.target:

[jbudorick, 2016/03/11 16:28:14]

Can we limit this to Android?

[agrieve, 2016/03/11 18:43:58]

Done.

+      extra_env['CHROMIUM_OUTPUT_DIR'] = (
+          os.path.abspath(os.path.join(options.build_dir, options.target)))
 
     # This option is used by sanitizer code. There is no corresponding command
     # line flag.
     options.use_symbolization_script = False
     # Set up extra environment and args for sanitizer tools.
     _ConfigureSanitizerTools(options, args, extra_env)
 
     # Set the number of shards environment variables.
     # NOTE: Chromium's test launcher will ignore these in favor of the command
     # line flags passed in _BuildTestBinaryCommand.
@@ skipping 68 matching lines @@
   finally:
     if did_launch_dbus:
       # It looks like the command line argument --exit-with-session
       # isn't working to clean up the spawned dbus-daemon. Kill it
       # manually.
       _ShutdownDBus()
 
 
 if '__main__' == __name__:
   sys.exit(main())