Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Unified Diff: build/android/pylib/device/device_utils.py

Issue 1134353002: Add --split-apk-path flag to apk_install.py, and install-multiple logic to adb_wrapper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/android/pylib/device/device_utils.py
diff --git a/build/android/pylib/device/device_utils.py b/build/android/pylib/device/device_utils.py
index 967809ff8e2860d5846f181b780e1ed7c341dc33..72422467ee3d8d075d36be3c3599280ddc62f778 100644
--- a/build/android/pylib/device/device_utils.py
+++ b/build/android/pylib/device/device_utils.py
@@ -444,7 +444,8 @@ class DeviceUtils(object):
@decorators.WithTimeoutAndRetriesDefaults(
INSTALL_DEFAULT_TIMEOUT,
INSTALL_DEFAULT_RETRIES)
- def Install(self, apk_path, reinstall=False, timeout=None, retries=None):
+ def Install(self, apk_path, reinstall=False, timeout=None, retries=None,
+ split_paths=None):
"""Install an APK.
Noop if an identical APK is already installed.
@@ -454,6 +455,8 @@ class DeviceUtils(object):
reinstall: A boolean indicating if we should keep any existing app data.
timeout: timeout in seconds
retries: number of retries
+ split_paths: (optional) List of splits to install. Triggers use of
+ "adb install-multiple" rather than "adb install".
Raises:
CommandFailedError if the installation fails.
@@ -469,7 +472,7 @@ class DeviceUtils(object):
else:
should_install = True
if should_install:
- self.adb.Install(apk_path, reinstall=reinstall)
+ self.adb.Install(apk_path, reinstall=reinstall, split_paths=split_paths)
@decorators.WithTimeoutAndRetriesFromInstance()
def RunShellCommand(self, cmd, check_return=False, cwd=None, env=None,
@@ -1585,4 +1588,3 @@ class DeviceUtils(object):
return [cls(adb) for adb in adb_wrapper.AdbWrapper.Devices()
if not blacklisted(adb)]
-

Powered by Google App Engine
This is Rietveld 408576698