Add --split-apk-path flag to apk_install.py, and install-multiple logic to adb_wrapper

build/android/pylib/device/adb_wrapper.py

 # Copyright 2013 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.
 
 """This module wraps Android's adb tool.
 
 This is a thin wrapper around the adb interface. Any additional complexity
 should be delegated to a higher level (ex. DeviceUtils).
 """
 
@@ skipping 372 matching lines @@
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
 
     Returns:
       A list of PIDs as strings.
     """
     return [a.strip() for a in
             self._RunDeviceAdbCmd(['jdwp'], timeout, retries).split('\n')]
 
   def Install(self, apk_path, forward_lock=False, reinstall=False,
-              sd_card=False, timeout=60*2, retries=_DEFAULT_RETRIES):
+              sd_card=False, timeout=60*2, retries=_DEFAULT_RETRIES,
+              split_paths=None):
     """Install an apk on the device.
 
     Args:
       apk_path: Host path to the APK file.
       forward_lock: (optional) If set forward-locks the app.
       reinstall: (optional) If set reinstalls the app, keeping its data.
       sd_card: (optional) If set installs on the SD card.
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
+      split_paths: (optional) List of splits to install. Triggers use of
+          "adb install-multiple" rather than "adb install".
     """
     _VerifyLocalFileExists(apk_path)
-    cmd = ['install']
+    if split_paths:
+      cmd = ['install-multiple']

[jbudorick, 2015/05/13 15:15:42]

This should be in its own InstallMultiple function if we want it at all. (I'm
not entirely convinced that we do, though.)

[agrieve, 2015/05/13 15:47:46]

Done.

+    else:
+      cmd = ['install']
     if forward_lock:
       cmd.append('-l')
     if reinstall:
       cmd.append('-r')
     if sd_card:
       cmd.append('-s')
     cmd.append(apk_path)
+    if split_paths:
+      cmd.extend(split_paths)
     output = self._RunDeviceAdbCmd(cmd, timeout, retries)
     if 'Success' not in output:
       raise device_errors.AdbCommandFailedError(
           cmd, output, device_serial=self._device_serial)
 
   def Uninstall(self, package, keep_data=False, timeout=_DEFAULT_TIMEOUT,
                 retries=_DEFAULT_RETRIES):
     """Remove the app |package| from the device.
 
     Args:
@@ skipping 140 matching lines @@
   @property
   def is_emulator(self):
     return _EMULATOR_RE.match(self._device_serial)
 
   @property
   def is_ready(self):
     try:
       return self.GetState() == _READY_STATE
     except device_errors.CommandFailedError:
       return False
-