Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3315)

Unified Diff: build/android/devil/android/device_utils.py

Issue 1416703003: [Android] Add a configurable environment for devil/. (RELAND 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 aee5d7cac35f7a5a5720ffd216986780f02bb8d1..96cae8ae48d1cea3516f24c7675d9af3b791ee49 100644
--- a/build/android/devil/android/device_utils.py
+++ b/build/android/devil/android/device_utils.py
@@ -22,6 +22,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
@@ -40,7 +41,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
@@ -105,7 +105,8 @@ 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.LocalPath('android_sdk'),
+ 'tools', 'android'),
'list', 'avd']).splitlines()
avds = []
for line in lines:

Powered by Google App Engine
This is Rietveld 408576698