🐠 Use the new DeviceUtils.HealthyDevices(device_arg=) in a few scripts

build/android/adb_command_line.py

 #!/usr/bin/python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility for reading / writing command-line flag files on device(s)."""
 
 import argparse
 import sys
 
 import devil_chromium
 
 from devil.android import device_utils
 from devil.android import device_errors
 from devil.utils import cmd_helper
 
 
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
   parser.usage = '''%(prog)s --device-path PATH [--device SERIAL] [flags...]
 
 No flags: Prints existing command-line file.
 Empty string: Deletes command-line file.
 Otherwise: Writes command-line file.
 
 '''
-  parser.add_argument('-d', '--device', dest='device',
-                      help='Target device for apk to install on.')
+  parser.add_argument('-d', '--device', dest='devices', action='append',
+                      default=[], help='Target device serial (repeatable).')
   parser.add_argument('--device-path', required=True,
                       help='Remote path to flags file.')
   parser.add_argument('-e', '--executable', dest='executable', default='chrome',
                       help='Name of the executable.')
   args, remote_args = parser.parse_known_args()
 
   devil_chromium.Initialize()
 
   as_root = not args.device_path.startswith('/data/local/tmp/')
 
-  if args.device:
-    devices = [device_utils.DeviceUtils(args.device, default_retries=0)]
-  else:
-    devices = device_utils.DeviceUtils.HealthyDevices(default_retries=0)
-    if not devices:
-      raise device_errors.NoDevicesError()
-
+  devices = device_utils.DeviceUtils.HealthyDevices(device_arg=args.devices,
+                                                    default_retries=0)
   all_devices = device_utils.DeviceUtils.parallel(devices)
 
   def print_args():
     def read_flags(device):
       try:
         return device.ReadFile(args.device_path, as_root=as_root).rstrip()
       except device_errors.AdbCommandFailedError:
         return ''  # File might not exist.
 
     descriptions = all_devices.pMap(lambda d: d.build_description).pGet(None)
@@ skipping 24 matching lines @@
     device.RunShellCommand(['chmod', '0664', args.device_path], as_root=as_root)
 
   all_devices.pMap(write_flags).pGet(None)
   print 'Wrote flags to %s' % args.device_path
   print_args()
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())