build/android/devil/android/device_utils.py - Issue 1399273002: [Android] Add a configurable environment for devil/. (RELAND)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1399273002: [Android] Add a configurable environment for devil/. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed: more non-default directory handling, especially for gyp_managed_install Created 5 years, 2 months 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

« no previous file with comments | « build/android/devil/android/device_temp_file_test.py ('k') | build/android/devil/android/device_utils_test.py » ('j') | build/android/gyp/get_device_configuration.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 73ed277c65d40aca9171ed28b7224e69d9292695..737be5d5e68e91319dc7d1ca558fe3341d2e182a 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,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: