Revert of [Android] Add a configurable environment for devil/. (RELAND)

build/android/devil/android/sdk/adb_wrapper.py

 # 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.
 
 """This module wraps Android's adb tool.
 
 This is a thin wrapper around the adb interface. Any additional complexity
 should be delegated to a higher level (ex. DeviceUtils).
 """
 
 import collections
 import errno
 import logging
 import os
 import re
-import threading
 
-from devil import devil_env
 from devil.android import decorators
 from devil.android import device_errors
 from devil.utils import cmd_helper
 from devil.utils import timeout_retry
+from pylib import constants
 
 
 _DEFAULT_TIMEOUT = 30
 _DEFAULT_RETRIES = 2
 
 _EMULATOR_RE = re.compile(r'^emulator-[0-9]+$')
 
 _READY_STATE = 'device'
 
 
@@ skipping 10 matching lines @@
     raise IOError(errno.ENOENT, os.strerror(errno.ENOENT), path)
 
 
 DeviceStat = collections.namedtuple('DeviceStat',
                                     ['st_mode', 'st_size', 'st_time'])
 
 
 class AdbWrapper(object):
   """A wrapper around a local Android Debug Bridge executable."""
 
-  _adb_path = None
-  _adb_path_lock = threading.Lock()
-
   def __init__(self, device_serial):
     """Initializes the AdbWrapper.
 
     Args:
       device_serial: The device serial number as a string.
     """
     if not device_serial:
       raise ValueError('A device serial must be specified')
     self._device_serial = str(device_serial)
 
-  @classmethod
-  def _GetAdbPath(cls):
-    if not cls._adb_path:
-      with cls._adb_path_lock:
-        if not cls._adb_path:
-          cls._adb_path = devil_env.config.FetchPath('adb')
-    return cls._adb_path
-
+  # pylint: disable=unused-argument
   @classmethod
   def _BuildAdbCmd(cls, args, device_serial, cpu_affinity=None):
     if cpu_affinity is not None:
       cmd = ['taskset', '-c', str(cpu_affinity)]
     else:
       cmd = []
-    cmd.append(cls._GetAdbPath())
+    cmd.append(constants.GetAdbPath())
     if device_serial is not None:
       cmd.extend(['-s', device_serial])
     cmd.extend(args)
     return cmd
+  # pylint: enable=unused-argument
 
   # pylint: disable=unused-argument
   @classmethod
   @decorators.WithTimeoutAndRetries
   def _RunAdbCmd(cls, args, timeout=None, retries=None, device_serial=None,
                  check_error=True, cpu_affinity=None):
     # pylint: disable=no-member
     status, output = cmd_helper.GetCmdStatusAndOutputWithTimeout(
         cls._BuildAdbCmd(args, device_serial, cpu_affinity=cpu_affinity),
         timeout_retry.CurrentTimeoutThreadGroup().GetRemainingTime())
@@ skipping 570 matching lines @@
   @property
   def is_emulator(self):
     return _EMULATOR_RE.match(self._device_serial)
 
   @property
   def is_ready(self):
     try:
       return self.GetState() == _READY_STATE
     except device_errors.CommandFailedError:
       return False