diff options
| author | jbudorick <jbudorick@chromium.org> | 2016-01-25 13:54:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-25 21:56:34 +0000 |
| commit | ee79fb6cc2e8c513fa5290bfe98a433aa8cea64f (patch) | |
| tree | 8f129dff584ee7eb3b44ae46999d3e1960394aee /build/android/adb_install_apk.py | |
| parent | 4782f344419a9990300da9e9312f7083a38ec47d (diff) | |
| download | chromium_src-ee79fb6cc2e8c513fa5290bfe98a433aa8cea64f.zip chromium_src-ee79fb6cc2e8c513fa5290bfe98a433aa8cea64f.tar.gz chromium_src-ee79fb6cc2e8c513fa5290bfe98a433aa8cea64f.tar.bz2 | |
[Android] Add configurable timeout to adb_install_apk.py
BUG=
Review URL: https://codereview.chromium.org/1630953002
Cr-Commit-Position: refs/heads/master@{#371326}
Diffstat (limited to 'build/android/adb_install_apk.py')
| -rwxr-xr-x | build/android/adb_install_apk.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py index c6bd7c2..4bf5ad5 100755 --- a/build/android/adb_install_apk.py +++ b/build/android/adb_install_apk.py @@ -63,6 +63,10 @@ def main(): help='Enable verbose logging.') parser.add_argument('--downgrade', action='store_true', help='If set, allows downgrading of apk.') + parser.add_argument('--timeout', type=int, + default=device_utils.DeviceUtils.INSTALL_DEFAULT_TIMEOUT, + help='Seconds to wait for APK installation. ' + '(default: %(default)s)') args = parser.parse_args() @@ -121,7 +125,8 @@ def main(): allow_downgrade=args.downgrade) else: device.Install(apk, reinstall=args.keep_data, - allow_downgrade=args.downgrade) + allow_downgrade=args.downgrade, + timeout=args.timeout) except device_errors.CommandFailedError: logging.exception('Failed to install %s', args.apk_name) if blacklist: |