build/android/pylib/device/adb_wrapper.py - Issue 711113002: Add option to specify ADB binary in test runner.

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

Issue 711113002: Add option to specify ADB binary in test runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Decided to move where ADB added to path to test_runner.py Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/android/pylib/device/adb_wrapper.py

diff --git a/build/android/pylib/device/adb_wrapper.py b/build/android/pylib/device/adb_wrapper.py

index 97f387ada22f9b79dfdea6e00d1bd4021883a6a9..5a16bcf206c5cf65a1949ab7ede83e3a1b17e923 100644

--- a/build/android/pylib/device/adb_wrapper.py

+++ b/build/android/pylib/device/adb_wrapper.py

@@ -12,6 +12,7 @@ import errno

import os

from pylib import cmd_helper

+from pylib import constants

from pylib.device import decorators

from pylib.device import device_errors

from pylib.utils import timeout_retry

@@ -49,7 +50,7 @@ class AdbWrapper(object):

@classmethod

@decorators.WithTimeoutAndRetries

def _RunAdbCmd(cls, arg_list, timeout=None, retries=None, check_error=True):

- cmd = ['adb'] + arg_list

+ cmd = [constants.GetAdbPath()] + arg_list

exit_code, output = cmd_helper.GetCmdStatusAndOutputWithTimeout(

cmd, timeout_retry.CurrentTimeoutThread().GetRemainingTime())

if exit_code != 0: