[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 logging
@@ skipping 12 matching lines @@
 
   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('--apk-split',

[jbudorick, 2015/06/24 19:00:39]

Using this as-is looks like this:

  ./build/android/adb_install_apk.py --apk-split FooSplit1.apk --apk-split
FooSplit2.apk --apk-split FooSplit3.apk ...

right?

Why not simplify this and just use positional args, akin to what I'm doing with
non-split APKs, possibly with a --split flag just to indicate that all provided
APKs should be installed as a split?

e.g.

  ./build/android/adb_install_apk.py [--split] FooSplit1.apk FooSplit2.apk
FooSplit3.apk ...

If we opt not to provide the --split flag, then the script would always try
InstallSplitApk if more than 1 apk were provided. This is slightly cleaner, but
doesn't allow for installing multiple non-split apks in a single call to
adb_install_apk (which I may be interested in doing in the future).

[mikecase (-- gone --), 2015/06/24 19:16:19]

Almost. Using this as is looks like this...

./build/android/adb_install_apk.py base_apk.apk --apk-split FooSplit1.apk
--apk-split FooSplit2.apk --apk-split FooSplit3.apk ...

The "base_apk" has to be kept separate from the splits (it has to be passed to
some of the scripts like split-select as the --base-apk). We could have the
convention that if you use the --split flag you have the base_apk as the first
apk, but I thought that could be confusing. Im not sure if you can tell which
apk is the base apk (using like aapt or something). I'll look into that, but I
dont know if its possible. 

+                      dest='apk_splits',
+                      action='append',
+                      help='An apk split. Can be specified multiple times. '
+                           'Used for installing a split apk.')
   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')
   parser.add_argument('--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.')
   parser.add_argument('-d', '--device', dest='device',
                       help='Target device for apk to install on.')
   parser.add_argument('-v', '--verbose', action='count',
                       help='Enable verbose logging.')
 
   args = parser.parse_args()
 
   run_tests_helper.SetLogLevel(args.verbose)
   constants.SetBuildType(args.build_type)
 
+  def resolve_apk_path(apk):
+    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)
+    return apk
+
   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)
+  apk = resolve_apk_path(apk)
+
+  if args.apk_splits:
+    for i, apk_split in enumerate(args.apk_splits):
+      args.apk_splits[i] = resolve_apk_path(apk_split)
 
   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.apk_splits:
+        device.InstallSplitApk(apk, args.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())