Android: allows using adb from a chromium checkout without envsetup.sh

build/android/pylib/android_commands.py

Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index d273cb9d794dde7d4e1243b8d9a145d6f2800b20..2b97ed95917b3210ef850454071a63da2b9de1e8 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -78,7 +78,8 @@ def GetEmulators():
     emulator-5558   device
   """
   re_device = re.compile('^emulator-[0-9]+', re.MULTILINE)
-  devices = re_device.findall(cmd_helper.GetCmdOutput(['adb', 'devices']))
+  devices = re_device.findall(cmd_helper.GetCmdOutput([constants.GetADBPath(),
+                                                       'devices']))
   return devices
 
 
@@ -104,7 +105,8 @@ def GetAttachedDevices():
     emulator-5554   offline
   """
   re_device = re.compile('^([a-zA-Z0-9_:.-]+)\tdevice$', re.MULTILINE)
-  devices = re_device.findall(cmd_helper.GetCmdOutput(['adb', 'devices']))
+  devices = re_device.findall(cmd_helper.GetCmdOutput([constants.GetADBPath(),
+                                                       'devices']))
   preferred_device = os.environ.get('ANDROID_SERIAL')
   if preferred_device in devices:
     devices.remove(preferred_device)
@@ -205,6 +207,10 @@ class AndroidCommands(object):
   """
 
   def __init__(self, device=None):
+    self._adb_path = constants.GetADBPath()
+    adb_dir = os.path.dirname(self._adb_path)
+    if adb_dir and adb_dir not in os.environ['PATH']:

[Isaac (away), 2013/06/04 10:01:45]

maybe 'adb_dir not in os.environ['PATH'].split(os.pathsep)' ?

[bulach, 2013/06/04 10:20:45]

Done.

+      os.environ['PATH'] += os.pathsep + adb_dir

[Isaac (away), 2013/06/04 10:01:45]

is this needed?  What other binaries are needed from path variable?

[bulach, 2013/06/04 10:20:45]

it's needed for third_party/android_testrunner that calls directly 'adb'. added
a comment to clarify.

     self._adb = adb_interface.AdbInterface()
     if device:
       self._adb.SetTargetSerial(device)
@@ -409,12 +415,12 @@ class AndroidCommands(object):
 
   def KillAdbServer(self):
     """Kill adb server."""
-    adb_cmd = ['adb', 'kill-server']
+    adb_cmd = [self._adb_path, 'kill-server']
     return cmd_helper.RunCmd(adb_cmd)
 
   def StartAdbServer(self):
     """Start adb server."""
-    adb_cmd = ['adb', 'start-server']
+    adb_cmd = [self._adb_path, 'start-server']
     return cmd_helper.RunCmd(adb_cmd)
 
   def WaitForSystemBootCompleted(self, wait_time):
@@ -922,7 +928,8 @@ class AndroidCommands(object):
 
     # Spawn logcat and syncronize with it.
     for _ in range(4):
-      self._logcat = pexpect.spawn('adb', args, timeout=10, logfile=logfile)
+      self._logcat = pexpect.spawn(self._adb_path, args, timeout=10,
+                                   logfile=logfile)
       self.RunShellCommand('log startup_sync')
       if self._logcat.expect(['startup_sync', pexpect.EOF,
                               pexpect.TIMEOUT]) == 0:
@@ -991,7 +998,7 @@ class AndroidCommands(object):
         logging.critical('Found EOF in adb logcat. Restarting...')
         # Rerun spawn with original arguments. Note that self._logcat.args[0] is
         # the path of adb, so we don't want it in the arguments.
-        self._logcat = pexpect.spawn('adb',
+        self._logcat = pexpect.spawn(self._adb_path,
                                      self._logcat.args[1:],
                                      timeout=self._logcat.timeout,
                                      logfile=self._logcat.logfile)