Add option to specify ADB binary in test runner.

third_party/android_testrunner/adb_interface.py

 #!/usr/bin/python2.4
 #
 #
 # Copyright 2008, The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
@@ skipping 16 matching lines @@
 # local imports
 import am_instrument_parser
 import errors
 import logger
 import run_command
 
 
 class AdbInterface:
   """Helper class for communicating with Android device via adb."""
 
-  # argument to pass to adb, to direct command to specific device
-  _target_arg = ""
+  DEVICE_TRACE_DIR = "/data/test_results/"
 
-  DEVICE_TRACE_DIR = "/data/test_results/"
+  def __init__(self, adb_path='adb'):
+    """Constructor.
+
+    Args:
+      adb_path: Absolute path to the adb binary that should be used. Defaults
+                to the adb in the environment path.
+    """
+    self._adb_path = adb_path
+    # argument to pass to adb, to direct command to specific device
+    self._target_arg = ""
 
   def SetEmulatorTarget(self):
     """Direct all future commands to the only running emulator."""
     self._target_arg = "-e"
 
   def SetDeviceTarget(self):
     """Direct all future commands to the only connected USB device."""
     self._target_arg = "-d"
 
   def SetTargetSerial(self, serial):
     """Direct all future commands to Android target with the given serial."""
     self._target_arg = "-s %s" % serial
 
   def SendCommand(self, command_string, timeout_time=20, retry_count=3):
     """Send a command via adb.
 
     Args:
       command_string: adb command to run
       timeout_time: number of seconds to wait for command to respond before
         retrying
       retry_count: number of times to retry command before raising
         WaitForResponseTimedOutError
     Returns:
       string output of command
 
     Raises:
       WaitForResponseTimedOutError if device does not respond to command within time
     """
-    adb_cmd = "adb %s %s" % (self._target_arg, command_string)
+    adb_cmd = "%s %s %s" % (self._adb_path, self._target_arg, command_string)
     logger.SilentLog("about to run %s" % adb_cmd)
     return run_command.RunCommand(adb_cmd, timeout_time=timeout_time,
                                   retry_count=retry_count)
 
   def SendShellCommand(self, cmd, timeout_time=20, retry_count=3):
     """Send a adb shell command.
 
     Args:
       cmd: adb shell command to run
       timeout_time: number of seconds to wait for command to respond before
@@ skipping 425 matching lines @@
       # press the MENU key, this will disable key guard if runtime is started
       # with ro.monkey set to 1
       self.SendShellCommand("input keyevent 82", retry_count=retry_count)
     else:
       self.WaitForDevicePm()
     return output
 
   def GetSerialNumber(self):
     """Returns the serial number of the targeted device."""
     return self.SendCommand("get-serialno").strip()