[Android] Add a configurable environment for devil/.

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 json
 import logging
 import os
 import signal
 import sys
 import threading
+import tempfile
 import unittest
 
 from devil import base_error
+from devil import devil_env
 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
 from pylib import forwarder
@@ skipping 17 matching lines @@
 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
 from pylib.uiautomator import setup as uiautomator_setup
 from pylib.uiautomator import test_options as uiautomator_test_options
 
 
+_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',
@@ skipping 44 matching lines @@
 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)
   if args.adb_path:
     constants.SetAdbPath(args.adb_path)
+
+  output_binary = lambda p: os.path.join(args.output_directory, p)
+  devil_dynamic_deps = {
+    'md5sum_host': output_binary('md5sum_bin_host'),
+    'md5sum_device': output_binary('md5sum_dist'),
+    'forwarder_host': output_binary('host_forwarder'),
+    'forwarder_device': output_binary('forwarder_dist'),
+  }
+  if args.adb_path:
+    devil_dynamic_deps['adb_path'] = args.adb_path
+
+  with tempfile.NamedTemporaryFile() as devil_dynamic_config_file:

[perezju, 2015/09/14 09:13:58]

Could we hide this tempfile thing in devil_env?

[jbudorick, 2015/09/14 13:12:39]

I need to talk to Kari about doing dynamic config natively in
dependency_manager, but in the meantime I can move it to devil_env.

+    devil_dynamic_config_file.write(
+        json.dumps(devil_env.GenerateDynamicConfig(devil_dynamic_deps)))
+    devil_dynamic_config_file.flush()
+    devil_env.Initialize([
+        _DEVIL_STATIC_CONFIG_FILE,
+        devil_dynamic_config_file.name
+    ])
+
   # 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 935 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())