Roll //build, //native_client, and a few more targets of opportunity.

build/android/adb_install_apk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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 script to install APKs from the command line quickly."""
 
 import optparse
 import os
 import sys
 
-from pylib import android_commands
 from pylib import constants
 from pylib.device import device_utils
 
 
 def AddInstallAPKOption(option_parser):
   """Adds apk option used to install the APK to the OptionParser."""
   option_parser.add_option('--apk',
                            help=('DEPRECATED The name of the apk containing the'
                                  ' application (with the .apk extension).'))
   option_parser.add_option('--apk_package',
@@ skipping 40 matching lines @@
   options, args = parser.parse_args(argv)
 
   if len(args) > 1 and options.apk:
     parser.error("Appending the apk as argument can't be used with --apk.")
   elif len(args) > 2:
     parser.error("Too many arguments.")
 
   constants.SetBuildType(options.build_type)
   ValidateInstallAPKOption(parser, options, args)
 
-  devices = android_commands.GetAttachedDevices()
+  devices = device_utils.DeviceUtils.HealthyDevices()
 
   if options.device:
-    if options.device not in devices:
+    device_serials = [d.adb.GetDeviceSerial() for d in devices]
+    if options.device not in device_serials:
       raise Exception('Error: %s not in attached devices %s' % (options.device,
-                      ','.join(devices)))
+                      ','.join(device_serials)))
     devices = [options.device]
 
   if not devices:
     raise Exception('Error: no connected devices')
 
   device_utils.DeviceUtils.parallel(devices).Install(
       options.apk, reinstall=options.keep_data)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))