Add option device in install apk script

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
@@ skipping 20 matching lines @@
                                  'the application.'))
   option_parser.add_option('--debug', action='store_const', const='Debug',
                            dest='build_type',
                            default=os.environ.get('BUILDTYPE', 'Debug'),
                            help='If set, run test suites under out/Debug. '
                            'Default is env var BUILDTYPE or Debug')
   option_parser.add_option('--release', action='store_const', const='Release',
                            dest='build_type',
                            help='If set, run test suites under out/Release. '
                            'Default is env var BUILDTYPE or Debug.')
+  option_parser.add_option('-d', '--device', dest='device',
+                           help=('Target device for apk to install on.'))
 
 
 def ValidateInstallAPKOption(option_parser, options):
   """Validates the apk option and potentially qualifies the path."""
   if not options.apk:
     option_parser.error('--apk is mandatory.')
   if not os.path.exists(options.apk):
     options.apk = os.path.join(constants.GetOutDirectory(), 'apks',
                                options.apk)
 
 
+def _GetAttachedDevices(device=None):

[mlamouri (slow - plz ping), 2014/06/11 09:07:21]

I would call the method GetTargetDevices() instead because it will not return
attached devices only, it can return only one device.

[mlamouri (slow - plz ping), 2014/06/11 09:07:21]

It seems that the _Foo() convention isn't used in that file. Methods are called
Foo() instead.

+  """Get all attached devices.
+
+  Args:
+    device: Name of a specific device to use.
+
+  Returns:
+    A list of attached devices.
+  """
+  attached_devices = []
+
+  attached_devices = android_commands.GetAttachedDevices()
+  if device:
+    assert device in attached_devices, (

[mlamouri (slow - plz ping), 2014/06/11 09:07:21]

It seems that we use |raise Exception('Error: ...')| instead of assert in this
file.

+        'Did not find device %s among attached device. Attached devices: %s'
+        % (device, ', '.join(attached_devices)))
+    attached_devices = [device]
+
+  assert attached_devices, 'No devices attached.'
+
+  return sorted(attached_devices)
+
+
 def main(argv):
   parser = optparse.OptionParser()
   AddInstallAPKOption(parser)
   options, args = parser.parse_args(argv)
   constants.SetBuildType(options.build_type)
   ValidateInstallAPKOption(parser, options)
   if len(args) > 1:
     raise Exception('Error: Unknown argument:', args[1:])
 
-  devices = android_commands.GetAttachedDevices()
+  devices = _GetAttachedDevices(options.device)

[jbudorick, 2014/06/11 14:32:00]

I'd much rather see something like this both here and in test_runner.py (though
I don't expect you to change the latter):

  devices = android_commands.GetAttachedDevices()

  if options.device:
    if options.device not in devices:
      raise Exception('Error: %s not in attached devices %s' % (device, '
'.join(devices)))
    devices = [options.device]

   if not devices:
     raise Exception('Error: no connected devices')
 
   if not options.apk_package:
     options.apk_package = apk_helper.GetPackageName(options.apk)
 
   device_utils.DeviceUtils.parallel(devices).old_interface.ManagedInstall(
       options.apk, options.keep_data, options.apk_package).pFinish(None)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))