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

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 1e370f8fa8ea4c765a5bb003b94a666473c9d08b..7e7a135134b33a7bd6c1c61fd0f2601fb855a43c 100755
--- a/build/android/adb_install_apk.py
+++ b/build/android/adb_install_apk.py
@@ -30,6 +30,11 @@ def main():
 
   # 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,
@@ -54,13 +59,21 @@ def main():
   run_tests_helper.SetLogLevel(args.verbose)
   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)
+  def resolve_apk_path(apk):
+    if not apk.endswith('.apk'):
+      apk += '.apk'
     if not os.path.exists(apk):
-      parser.error('%s not found.' % 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
+  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()
 
@@ -73,7 +86,10 @@ def main():
 
   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)])