[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 logging
 import os
 import signal
 import sys
 import threading
 import unittest
 
 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
+import devil.env
 from devil.utils import reraiser_thread
 from devil.utils import run_tests_helper
 
 from pylib import constants
 from pylib import forwarder
 from pylib.base import base_test_result
 from pylib.base import environment_factory
 from pylib.base import test_dispatcher
 from pylib.base import test_instance_factory
 from pylib.base import test_run_factory
@@ skipping 76 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)
+
+  devil.env.android_sdk = devil.env.android_sdk_config.AndroidSdkConfig(

[jbudorick, 2015/09/09 23:47:07]

Configuring devil's environment is intentionally ugly because it:
 - shouldn't be done often, and
 - shouldn't be easy to do on accident

[perezju, 2015/09/10 09:45:48]

Throwing some ideas: If the intention is that configs shouldn't easily change
after being set. I think, e.g., AndroidSdkConfig should return a named tuple
with all the config values already set, rather than an object with a hidden dict
and properties whose values might change between calls. With a named tuple
values can't be accidentally changed by clients or the environment. This also
tightens things up as we wouldn't be able to set values for non-existent
properties.

Now trying to _read_ from an unset devil.env.android_sdk should either throw an
exception or try to guess some sensible defaults *and fix them* at that time.

+      root_path=constants.ANDROID_SDK_ROOT,
+      adb_path=args.adb_path)
+  devil.env.binaries = devil.env.binary_config.BinaryConfig(
+      binary_dir=constants.GetOutDirectory())
+
   # 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())