mojo/devtools/common/devtoolslib/paths.py - Issue 1781063002: Only set the ADB path if it exists.

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: mojo/devtools/common/devtoolslib/paths.py

Issue 1781063002: Only set the ADB path if it exists. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 4 years, 9 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:

Index: mojo/devtools/common/devtoolslib/paths.py

diff --git a/mojo/devtools/common/devtoolslib/paths.py b/mojo/devtools/common/devtoolslib/paths.py

index 8c592aea2decb4e99cfdebde8baa14fe7ca4706b..870dd0a9af0510b13544f3706e5de8642348a267 100644

--- a/mojo/devtools/common/devtoolslib/paths.py

+++ b/mojo/devtools/common/devtoolslib/paths.py

@@ -59,8 +59,10 @@ def infer_params(is_android, is_debug, target_cpu):

params['build_dir_path'] = build_dir_path

if is_android:

params['shell_path'] = os.path.join(build_dir_path, 'apks', 'MojoShell.apk')

- params['adb_path'] = os.path.join(root_path, 'third_party', 'android_tools',

- 'sdk', 'platform-tools', 'adb')

+ adb_path = os.path.join(root_path, 'third_party', 'android_tools',

+ 'sdk', 'platform-tools', 'adb')

+ if os.path.isfile(adb_path):

+ params['adb_path'] = adb_path

else:

params['shell_path'] = os.path.join(build_dir_path, 'mojo_shell')

« no previous file with comments | « no previous file | no next file » | no next file with comments »