[Android] Add a configurable environment for devil/. (RELAND 2)

build/android/test_runner.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.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
 import itertools
 import logging
 import os
 import signal
 import sys
 import threading
 import unittest
 
+import devil_chromium
+
 from devil import base_error
 from devil.android import apk_helper
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_utils
 from devil.android import ports
 from devil.utils import reraiser_thread
 from devil.utils import run_tests_helper
 
 from pylib import constants
@@ skipping 11 matching lines @@
 from pylib.junit import test_dispatcher as junit_dispatcher
 from pylib.monkey import setup as monkey_setup
 from pylib.monkey import test_options as monkey_test_options
 from pylib.perf import setup as perf_setup
 from pylib.perf import test_options as perf_test_options
 from pylib.perf import test_runner as perf_test_runner
 from pylib.results import json_results
 from pylib.results import report_results
 
 
+_DEVIL_STATIC_CONFIG_FILE = os.path.abspath(os.path.join(
+    constants.DIR_SOURCE_ROOT, 'build', 'android', 'devil_config.json'))
+
+
 def AddCommonOptions(parser):
   """Adds all common options to |parser|."""
 
   group = parser.add_argument_group('Common Options')
 
   default_build_type = os.environ.get('BUILDTYPE', 'Debug')
 
   debug_or_release_group = group.add_mutually_exclusive_group()
   debug_or_release_group.add_argument(
       '--debug', action='store_const', const='Debug', dest='build_type',
       default=default_build_type,
       help=('If set, run test suites under out/Debug. '
             'Default is env var BUILDTYPE or Debug.'))
   debug_or_release_group.add_argument(
       '--release', action='store_const', const='Release', dest='build_type',
       help=('If set, run test suites under out/Release. '
             'Default is env var BUILDTYPE or Debug.'))
 
   group.add_argument('--build-directory', dest='build_directory',
                      help=('Path to the directory in which build files are'
                            ' located (should not include build type)'))
   group.add_argument('--output-directory', dest='output_directory',
                      help=('Path to the directory in which build files are'
                            ' located (must include build type). This will take'
                            ' precedence over --debug, --release and'
                            ' --build-directory'))
   group.add_argument('--num_retries', '--num-retries', dest='num_retries',

[nednguyen, 2015/10/28 16:52:32]

Duplicate args?

[jbudorick, 2015/10/28 16:54:24]

_ and -

[nednguyen, 2015/10/28 16:55:22]

Ah, didn't know that argparse support this. Really cool :-)

                      type=int, default=2,
                      help=('Number of retries for a test before '
                            'giving up (default: %(default)s).'))
   group.add_argument('-v',
                      '--verbose',
                      dest='verbose_count',
                      default=0,
                      action='count',
                      help='Verbose level (multiple times for more)')
   group.add_argument('--flakiness-dashboard-server',
@@ skipping 16 matching lines @@
                           'to specified file.')
 
 def ProcessCommonOptions(args):
   """Processes and handles all common options."""
   run_tests_helper.SetLogLevel(args.verbose_count)
   constants.SetBuildType(args.build_type)
   if args.build_directory:
     constants.SetBuildDirectory(args.build_directory)
   if args.output_directory:
     constants.SetOutputDirectory(args.output_directory)
+
+  devil_custom_deps = None
   if args.adb_path:
-    constants.SetAdbPath(args.adb_path)
+    devil_custom_deps = {
+      'adb': {
+        'android_host': [args.adb_path]
+      }
+    }
+
+  devil_chromium.Initialize(
+      output_directory=constants.GetOutDirectory(),
+      custom_deps=devil_custom_deps)
+
   # Some things such as Forwarder require ADB to be in the environment path.
   adb_dir = os.path.dirname(constants.GetAdbPath())
   if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):
     os.environ['PATH'] = adb_dir + os.pathsep + os.environ['PATH']
 
 
 def AddRemoteDeviceOptions(parser):
   group = parser.add_argument_group('Remote Device Options')
 
   group.add_argument('--trigger',
@@ skipping 876 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())