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

Unified Diff: build/android/adb_install_apk.py

Issue 1577383002: [Android] Make the adb path configurable in three scripts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | build/android/buildbot/bb_device_status_check.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/adb_install_apk.py
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
index dc5b6f1371f17e9c3aedabdadbe88c0dda13fde3..c6bd7c25d32bab75adbb48cde5a97be96892990d 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -13,7 +13,7 @@ import os
import sys
import devil_chromium
-
+from devil import devil_env
from devil.android import apk_helper
from devil.android import device_blacklist
from devil.android import device_errors
@@ -56,6 +56,8 @@ def main():
parser.add_argument('-d', '--device', dest='devices', action='append',
help='Target device for apk to install on. Enter multiple'
' times for multiple devices.')
+ parser.add_argument('--adb-path',
+ help='Absolute path to the adb binary to use.')
parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
parser.add_argument('-v', '--verbose', action='count',
help='Enable verbose logging.')
@@ -67,7 +69,17 @@ def main():
run_tests_helper.SetLogLevel(args.verbose)
constants.SetBuildType(args.build_type)
- devil_chromium.Initialize(output_directory=constants.GetOutDirectory())
+ devil_custom_deps = None
+ if args.adb_path:
+ devil_custom_deps = {
+ 'adb': {
+ devil_env.GetPlatform(): [args.adb_path],
+ },
+ }
+
+ devil_chromium.Initialize(
+ output_directory=constants.GetOutDirectory(),
+ custom_deps=devil_custom_deps)
apk = args.apk_path or args.apk_name
if not apk.endswith('.apk'):
« no previous file with comments | « no previous file | build/android/buildbot/bb_device_status_check.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698