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

Unified Diff: build/android/adb_install_apk.py

Issue 1895163002: 🐠 Use the new DeviceUtils.HealthyDevices(device_arg=) in a few scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « build/android/adb_command_line.py ('k') | build/android/adb_reverse_forwarder.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 4bf5ad562ed4696d91c100898f0eb5aece90ef5f..bc55bf88b456dfe35123647c6739395e470fe3b8 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -54,6 +54,7 @@ def main():
help='If set, run test suites under out/Release. '
'Default is env var BUILDTYPE or Debug.')
parser.add_argument('-d', '--device', dest='devices', action='append',
+ default=[],
help='Target device for apk to install on. Enter multiple'
' times for multiple devices.')
parser.add_argument('--adb-path',
@@ -109,14 +110,8 @@ def main():
blacklist = (device_blacklist.Blacklist(args.blacklist_file)
if args.blacklist_file
else None)
- devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
-
- if args.devices:
- devices = [d for d in devices if d in args.devices]
- if not devices:
- raise device_errors.DeviceUnreachableError(args.devices)
- elif not devices:
- raise device_errors.NoDevicesError()
+ devices = device_utils.DeviceUtils.HealthyDevices(blacklist=blacklist,
+ device_arg=args.devices)
def blacklisting_install(device):
try:
« no previous file with comments | « build/android/adb_command_line.py ('k') | build/android/adb_reverse_forwarder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698