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

build/android/pylib/device/device_utils_test.py

Index: build/android/pylib/device/device_utils_test.py
diff --git a/build/android/pylib/device/device_utils_test.py b/build/android/pylib/device/device_utils_test.py
index 23a1a325e7680dda7e12d2fa8a3c8e6a084b8d3b..b6c5a2fea38f87da86d42e3ef5811f1795f13e81 100755
--- a/build/android/pylib/device/device_utils_test.py
+++ b/build/android/pylib/device/device_utils_test.py
@@ -474,9 +474,20 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
         (mock.call.pylib.utils.apk_helper.GetPackageName('/fake/test/app.apk'),
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPath('this.is.a.test.package'), None),
-        self.call.adb.Install('/fake/test/app.apk', reinstall=False)):
+        self.call.adb.Install('/fake/test/app.apk', reinstall=False,
+            split_paths=None)):
       self.device.Install('/fake/test/app.apk', retries=0)
 
+  def testInstall_withSplits(self):
+    with self.assertCalls(
+        (mock.call.pylib.utils.apk_helper.GetPackageName('/fake/test/app.apk'),
+         'this.is.a.test.package'),
+        (self.call.device.GetApplicationPath('this.is.a.test.package'), None),
+        self.call.adb.Install('/fake/test/app.apk', reinstall=False,
+            split_paths=['/fake/test/split.apk'])):
+      self.device.Install('/fake/test/app.apk', retries=0,
+            split_paths=['/fake/test/split.apk'])
+
   def testInstall_differentPriorInstall(self):
     with self.assertCalls(
         (mock.call.pylib.utils.apk_helper.GetPackageName('/fake/test/app.apk'),
@@ -487,7 +498,8 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
             '/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk'),
          [('/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk')]),
         self.call.adb.Uninstall('this.is.a.test.package'),
-        self.call.adb.Install('/fake/test/app.apk', reinstall=False)):
+        self.call.adb.Install('/fake/test/app.apk', reinstall=False,
+            split_paths=None)):
       self.device.Install('/fake/test/app.apk', retries=0)
 
   def testInstall_differentPriorInstall_reinstall(self):
@@ -499,7 +511,8 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
         (self.call.device._GetChangedFilesImpl(
             '/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk'),
          [('/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk')]),
-        self.call.adb.Install('/fake/test/app.apk', reinstall=True)):
+        self.call.adb.Install('/fake/test/app.apk', reinstall=True,
+            split_paths=None)):
       self.device.Install('/fake/test/app.apk', reinstall=True, retries=0)
 
   def testInstall_identicalPriorInstall(self):
@@ -518,7 +531,8 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
         (mock.call.pylib.utils.apk_helper.GetPackageName('/fake/test/app.apk'),
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPath('this.is.a.test.package'), None),
-        (self.call.adb.Install('/fake/test/app.apk', reinstall=False),
+        (self.call.adb.Install('/fake/test/app.apk', reinstall=False,
+            split_paths=None),
          self.CommandError('Failure\r\n'))):
       with self.assertRaises(device_errors.CommandFailedError):
         self.device.Install('/fake/test/app.apk', retries=0)
@@ -1679,4 +1693,3 @@ class DeviceUtilsHealthyDevicesTest(mock_calls.TestCase):
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)
-