Add option to specify ADB binary in test runner.

build/android/pylib/constants.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.
 
 """Defines a set of constants shared by test runners and other scripts."""
 # pylint: disable=W0212
 
 import collections
 import logging
 import os
@@ skipping 220 matching lines @@
 def _Memoize(func):
   def Wrapper():
     try:
       return func._result
     except AttributeError:
       func._result = func()
       return func._result
   return Wrapper
 
 
+def SetAdbPath(adb_path):
+  os.environ['ADB_PATH'] = adb_path
+
+
+def GetAdbPath():

[jbudorick, 2014/11/11 15:27:23]

Why is this separate from _FindAdbPath?

[mikecase (-- gone --), 2014/11/11 17:56:41]

So I can keep the @_Memoize decorator on the logic inside _FindAdbPath (saves
the result the first time the function is called, and just returns that result
from then on). If I had @_Memoize on the whole function, SetAdbPath wouldn't do
anything at all after GetAdbPath was called once which I didn't like. And if I
got rid of @_Memoize it would work but be a little slower.

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

Urgh, we need to rework these "constants."

SetAdbPath _shouldn't_ be called once we call GetAdbPath, but until we do rework
these constants, I guess this is ok.

+  # Check if a custom adb path as been set. If not, try to find adb
+  # on the system.
+  if os.environ.get('ADB_PATH'):
+    return os.environ.get('ADB_PATH')
+  else:
+    return _FindAdbPath()
+
+
 @_Memoize
-def GetAdbPath():
+def _FindAdbPath():
   if os.environ.get('ANDROID_SDK_ROOT'):
     return 'adb'
   # If envsetup.sh hasn't been sourced and there's no adb in the path,
   # set it here.
   try:
     with file(os.devnull, 'w') as devnull:
       subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
     return 'adb'
   except OSError:
     logging.debug('No adb found in $PATH, fallback to checked in binary.')
     return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
 
-
 # Exit codes
 ERROR_EXIT_CODE = 1
 WARNING_EXIT_CODE = 88