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

build/android/devil/android/device_utils.py

 # Copyright 2014 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 a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=unused-argument
 
 import collections
 import itertools
 import json
 import logging
 import multiprocessing
 import os
 import posixpath
 import re
 import shutil
 import tempfile
 import time
 import zipfile
 
 from devil import base_error
+from devil import devil_env
 from devil.utils import cmd_helper
 from devil.android import apk_helper
 from devil.android import device_signal
 from devil.android import decorators
 from devil.android import device_errors
 from devil.android import device_temp_file
 from devil.android import logcat_monitor
 from devil.android import md5sum
 from devil.android.sdk import adb_wrapper
 from devil.android.sdk import intent
 from devil.android.sdk import keyevent
 from devil.android.sdk import split_select
 from devil.android.sdk import version_codes
 from devil.utils import host_utils
 from devil.utils import parallelizer
 from devil.utils import reraiser_thread
 from devil.utils import timeout_retry
 from devil.utils import zip_utils
-from pylib import constants
 from pylib.device.commands import install_commands
 
 _DEFAULT_TIMEOUT = 30
 _DEFAULT_RETRIES = 3
 
 # A sentinel object for default values
 # TODO(jbudorick,perezju): revisit how default values are handled by
 # the timeout_retry decorators.
 DEFAULT = object()
 
@@ skipping 44 matching lines @@
 
 @decorators.WithExplicitTimeoutAndRetries(
     _DEFAULT_TIMEOUT, _DEFAULT_RETRIES)
 def GetAVDs():
   """Returns a list of Android Virtual Devices.
 
   Returns:
     A list containing the configured AVDs.
   """
   lines = cmd_helper.GetCmdOutput([
-      os.path.join(constants.ANDROID_SDK_ROOT, 'tools', 'android'),
+      os.path.join(devil_env.config.LocalPath('android_sdk'),
+                   'tools', 'android'),
       'list', 'avd']).splitlines()
   avds = []
   for line in lines:
     if 'Name:' not in line:
       continue
     key, value = (s.strip() for s in line.split(':', 1))
     if key == 'Name':
       avds.append(value)
   return avds
 
@@ skipping 2009 matching lines @@
       on: bool to decide state to switch to. True = on False = off.
     """
     def screen_test():
       return self.IsScreenOn() == on
 
     if screen_test():
       logging.info('Screen already in expected state.')
       return
     self.RunShellCommand('input keyevent 26')
     timeout_retry.WaitFor(screen_test, wait_period=1)