Add option device in install apk script

build/android/adb_install_apk.py

Index: build/android/adb_install_apk.py
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
index a91510137925e766cf5166768f78679e7ed51c12..69a36822deadf3dbe454edffe932c6249f56925a 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -38,6 +38,8 @@ def AddInstallAPKOption(option_parser):
                            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):
@@ -49,6 +51,29 @@ def ValidateInstallAPKOption(option_parser, options):
                                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)
@@ -58,7 +83,7 @@ def main(argv):
   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')