| Index: build/android/adb_install_apk.py
|
| diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py
|
| index c6bd7c25d32bab75adbb48cde5a97be96892990d..4bf5ad562ed4696d91c100898f0eb5aece90ef5f 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:
|
|
|