build/android/devil/android/sdk/adb_wrapper.py - Issue 1501843002: [Android] Use more specific host platforms 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 1501843002: [Android] Use more specific host platforms for devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: better handling of the no adb case 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/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 c184c77acb82dedbd3a37e03853ca911e2df8ca7..b254a7525bba9fc4395f8e909a68006d8b4fd712 100644

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

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

@@ -58,7 +58,10 @@ def _FindAdb():

except dependency_manager.NoPathFoundError:

pass

- return devil_env.config.FetchPath('adb')

+ try:

+ return devil_env.config.FetchPath('adb')

+ except dependency_manager.NoPathFoundError:

+ raise device_errors.NoAdbError()

DeviceStat = collections.namedtuple('DeviceStat',

« no previous file with comments | « build/android/devil/android/device_errors.py ('k') | build/android/devil/devil_dependencies.json » ('j') | no next file with comments »