build/android/devil/android/sdk/adb_wrapper.py - Issue 1316413003: [Android] Add a configurable environment for devil/.

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/sdk/adb_wrapper.py

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

Patch Set: Created 5 years, 3 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

« build/android/devil/android/battery_utils_test.py ('K') | « build/android/devil/android/sdk/aapt.py ('k') | build/android/devil/android/sdk/dexdump.py » ('j') | build/android/devil/env/__init__.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/build/android/devil/android/sdk/adb_wrapper.py b/build/android/devil/android/sdk/adb_wrapper.py

index b6ec4e826385569bb166954d8711743996c54e9a..d91e263a6cbb0fa532cad55e041bed968cea57c8 100644

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

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

@@ -14,11 +14,11 @@ import logging

import os

import re

+from devil import 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

@@ -66,7 +66,7 @@ class AdbWrapper(object):

cmd = ['taskset', '-c', str(cpu_affinity)]

else:

cmd = []

- cmd.append(constants.GetAdbPath())

+ cmd.append(env.android_sdk.adb_path)

if device_serial is not None:

cmd.extend(['-s', device_serial])

cmd.extend(args)