Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1001)

Unified Diff: mojo/devtools/common/devtoolslib/shell_config.py

Issue 1323973002: Have 'adb' as the default value for when adb_path is not specified (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/devtools/common/devtoolslib/shell_config.py
diff --git a/mojo/devtools/common/devtoolslib/shell_config.py b/mojo/devtools/common/devtoolslib/shell_config.py
index 6a93cb06d206d1294569ef609e541fc80c2ab0d0..b7f59d2d60c9650d8e4762b35a71bc7044656e57 100644
--- a/mojo/devtools/common/devtoolslib/shell_config.py
+++ b/mojo/devtools/common/devtoolslib/shell_config.py
@@ -152,7 +152,8 @@ def get_shell_config(script_args):
shell_config.verbose = script_args.verbose
# Android-only.
- shell_config.adb_path = (script_args.adb_path or inferred_paths['adb_path'])
+ shell_config.adb_path = (script_args.adb_path or inferred_paths['adb_path'] or
+ 'adb')
shell_config.target_device = script_args.target_device
shell_config.logcat_tags = script_args.logcat_tags
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698