Add option to specify ADB binary in test runner.

build/android/pylib/android_commands.py

 # 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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 # pylint: disable-all
 
@@ skipping 296 matching lines @@
 class AndroidCommands(object):
   """Helper class for communicating with Android device via adb."""
 
   def __init__(self, device=None):
     """Constructor.
 
     Args:
       device: If given, adb commands are only send to the device of this ID.
           Otherwise commands are sent to all attached devices.
     """
-    adb_dir = os.path.dirname(constants.GetAdbPath())
-    if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):
-      # Required by third_party/android_testrunner to call directly 'adb'.
-      os.environ['PATH'] += os.pathsep + adb_dir
     self._adb = adb_interface.AdbInterface()
+    self._adb.SetAdbPath(constants.GetAdbPath())

[jbudorick, 2014/11/11 18:04:03]

Add the adb path as a parameter to AdbInterface.__init__ instead.

[mikecase (-- gone --), 2014/11/11 19:36:01]

Done.

     if device:
       self._adb.SetTargetSerial(device)
     self._device = device
     self._logcat = None
     self.logcat_process = None
     self._logcat_tmpoutfile = None
     self._pushed_files = []
     self._device_utc_offset = None
     self._potential_push_size = 0
     self._actual_push_size = 0
@@ skipping 1633 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()