[Android] Add support for installing split apks with adb_install_apk.

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 argparse
+import glob
 import logging
 import os
 import sys
 
 from pylib import constants
 from pylib.device import device_blacklist
 from pylib.device import device_errors
 from pylib.device import device_utils
+from pylib.utils import apk_helper
 from pylib.utils import run_tests_helper
 
 
 def main():
   parser = argparse.ArgumentParser()
 
   apk_group = parser.add_mutually_exclusive_group(required=True)
   apk_group.add_argument('--apk', dest='apk_name',
                          help='DEPRECATED The name of the apk containing the'
                               ' application (with the .apk extension).')
   apk_group.add_argument('apk_path', nargs='?',
                          help='The path to the APK to install.')
 
   # TODO(jbudorick): Remove once no clients pass --apk_package
   parser.add_argument('--apk_package', help='DEPRECATED unused')
+  parser.add_argument('--split',
+                      action='append',
+                      dest='splits',
+                      help='A glob matching the apk splits. '
+                           'Can be specified multiple times.')
   parser.add_argument('--keep_data',
                       action='store_true',
                       default=False,
                       help='Keep the package data when installing '
                            'the application.')
   parser.add_argument('--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')
@@ skipping 12 matching lines @@
   constants.SetBuildType(args.build_type)
 
   apk = args.apk_path or args.apk_name
   if not apk.endswith('.apk'):
     apk += '.apk'
   if not os.path.exists(apk):
     apk = os.path.join(constants.GetOutDirectory(), 'apks', apk)
     if not os.path.exists(apk):
       parser.error('%s not found.' % apk)
 
+  if args.splits:
+    splits = []
+    base_apk_package = apk_helper.ApkHelper(apk).GetPackageName()
+    for split_pattern in args.splits:
+      if not split_pattern.endswith('.apk'):

[jbudorick, 2015/07/01 20:55:11]

What's with this? Why are we modifying a user's glob?

[mikecase (-- gone --), 2015/07/01 22:14:57]

Removed adding .apk to the end of the glob and instead check the files
it matches for '.apk'.

I still am messing with the glob a little bit. If the glob doesn't match any
apks,
I add the out directory to the glob and try to find apks again.

This is so people don't have to run this...
build/android/adb_install_apk.py Chrome.apk --split out/Debug/apks/Chrome*.apk
and can run this instead...
build/android/adb_install_apk.py Chrome.apk --split Chrome*.apk

[jbudorick, 2015/07/01 22:18:56]

This is going to sound somewhat get-off-my-lawn-ish, but:

No. Don't do this. I don't like that we accept "Chrome.apk" now, but we have to
keep doing it until the bots stop. Don't add more of it.

+        split_pattern += '.apk'
+      apks = glob.glob(split_pattern)
+      if not apks:
+        apks = glob.glob(os.path.join(constants.GetOutDirectory(),
+                         'apks', split_pattern))

[jbudorick, 2015/07/01 20:55:11]

nit: indentation is off. This implies that 'apks' is a parameter for glob.glob,
not os.path.join.

[mikecase (-- gone --), 2015/07/01 22:14:57]

Fixed.

+      if not apks:
+        logging.warning('No apks matched for %s.' % split_pattern)
+      for f in apks:
+        helper = apk_helper.ApkHelper(f)
+        if (helper.GetPackageName() == base_apk_package
+            and helper.GetSplitName() is not None):

[jbudorick, 2015/07/01 20:55:11]

nit:

  and helper.GetSplitName()

?

[mikecase (-- gone --), 2015/07/01 22:14:57]

Done

+          splits.append(f)
+
   devices = device_utils.DeviceUtils.HealthyDevices()
 
   if args.device:
     devices = [d for d in devices if d == args.device]
     if not devices:
       raise device_errors.DeviceUnreachableError(args.device)
   elif not devices:
     raise device_errors.NoDevicesError()
 
   def blacklisting_install(device):
     try:
-      device.Install(apk, reinstall=args.keep_data)
+      if args.splits:
+        device.InstallSplitApk(apk, splits, reinstall=args.keep_data)
+      else:
+        device.Install(apk, reinstall=args.keep_data)
     except device_errors.CommandFailedError:
       logging.exception('Failed to install %s', args.apk)
       device_blacklist.ExtendBlacklist([str(device)])
       logging.warning('Blacklisting %s', str(device))
     except device_errors.CommandTimeoutError:
       logging.exception('Timed out while installing %s', args.apk)
       device_blacklist.ExtendBlacklist([str(device)])
       logging.warning('Blacklisting %s', str(device))
 
   device_utils.DeviceUtils.parallel(devices).pMap(blacklisting_install)
 
 
 if __name__ == '__main__':
   sys.exit(main())