[Android] Add configurable timeout to adb_install_apk.py

build/android/adb_install_apk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Utility script to install APKs from the command line quickly."""
 
 import argparse
 import glob
@@ skipping 45 matching lines @@
   parser.add_argument('-d', '--device', dest='devices', action='append',
                       help='Target device for apk to install on. Enter multiple'
                            ' times for multiple devices.')
   parser.add_argument('--adb-path',
                       help='Absolute path to the adb binary to use.')
   parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
   parser.add_argument('-v', '--verbose', action='count',
                       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()
 
   run_tests_helper.SetLogLevel(args.verbose)
   constants.SetBuildType(args.build_type)
 
   devil_custom_deps = None
   if args.adb_path:
     devil_custom_deps = {
       'adb': {
@@ skipping 38 matching lines @@
   elif not devices:
     raise device_errors.NoDevicesError()
 
   def blacklisting_install(device):
     try:
       if args.splits:
         device.InstallSplitApk(apk, splits, reinstall=args.keep_data,
                                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:
         blacklist.Extend([str(device)], reason='install_failure')
         logging.warning('Blacklisting %s', str(device))
     except device_errors.CommandTimeoutError:
       logging.exception('Timed out while installing %s', args.apk_name)
       if blacklist:
         blacklist.Extend([str(device)], reason='install_timeout')
         logging.warning('Blacklisting %s', str(device))
 
   device_utils.DeviceUtils.parallel(devices).pMap(blacklisting_install)
 
 
 if __name__ == '__main__':
   sys.exit(main())