| Index: build/android/devil/android/device_utils.py
|
| diff --git a/build/android/devil/android/device_utils.py b/build/android/devil/android/device_utils.py
|
| index 96de1f88ede2a293f61d19c1d0940c4614ea2082..9e5aef470e5545f180fd849a07666fd504fabfed 100644
|
| --- a/build/android/devil/android/device_utils.py
|
| +++ b/build/android/devil/android/device_utils.py
|
| @@ -21,6 +21,7 @@ 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
|
| @@ -39,7 +40,6 @@ 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
|
| @@ -103,7 +103,7 @@ def GetAVDs():
|
| 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.android_sdk_path, 'tools', 'android'),
|
| 'list', 'avd']).splitlines()
|
| avds = []
|
| for line in lines:
|
|
|