Android: makes "apk_package" optional in adb_install_apk.py

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.
 
 import multiprocessing
 import optparse
 import os
 import sys
 
 from pylib import android_commands
+from pylib import apk_info
 from pylib import test_options_parser
 from pylib import constants

[frankf, 2012/10/31 18:04:26]

Move this up so it's alphabetical.

[bulach, 2012/10/31 18:44:20]

Done.

 
 
-def InstallApk(args):
-  options, device = args
-  apk_path = os.path.join(os.environ['CHROME_SRC'],
-                          'out', options.build_type,
-                          'apks', options.apk)
+def _InstallApk(args):
+  apk_path, apk_package, device = args
   result = android_commands.AndroidCommands(device=device).ManagedInstall(
-      apk_path, False, options.apk_package)
+      apk_path, False, apk_package)
   print '-----  Installed on %s  -----' % device
   print result
 
 
 def main(argv):
   parser = optparse.OptionParser()
   test_options_parser.AddBuildTypeOption(parser)
   test_options_parser.AddInstallAPKOption(parser)

[frankf, 2012/10/31 18:04:26]

Hmm. 'test_options_parser' has become a misnomer since this has nothing to do
with test :)

[bulach, 2012/10/31 18:44:20]

indeed! :) too big a change for this patch, but I can try to do separately.

   options, args = parser.parse_args(argv)
 
   if len(args) > 1:
     raise Exception('Error: Unknown argument:', args[1:])
 
   devices = android_commands.GetAttachedDevices()
   if not devices:
     raise Exception('Error: no connected devices')
 
+  apk_path = os.path.join(os.environ['CHROME_SRC'],
+                          'out', options.build_type,
+                          'apks', options.apk)

[frankf, 2012/10/31 18:04:26]

optional: Maybe move this to function similar to ValidInstrumentationOptions in
test_options_parser (and allow absolute path like options.test_apk). Ideally the
assumption on directory structure should be centralized so if it changes, we
don't need to modify a lot of scripts.

[bulach, 2012/10/31 18:44:20]

good idea! done..

+
+  apk_package = options.apk_package
+  if not apk_package:
+    apk_package = apk_info.GetPackageNameForApk(apk_path)
+
   pool = multiprocessing.Pool(len(devices))
-  # Send a tuple (options, device) per instance of DeploySingleDevice.
-  pool.map(InstallApk, zip([options] * len(devices), devices))
+  # Send a tuple (apk_path, apk_package, device) per device.
+  pool.map(_InstallApk, zip([apk_path] * len(devices),
+                           [apk_package] * len(devices),
+                           devices))
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))