[Android] Add --adb-path option for tombstones.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
 import logging
 import os
 import sys
 
 import devil_chromium
-from devil import devil_env
 from devil.android import apk_helper
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_utils
 from devil.utils import run_tests_helper
 from pylib import constants
 
 
 def main():
   parser = argparse.ArgumentParser()
@@ skipping 40 matching lines @@
   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': {
-        devil_env.GetPlatform(): [args.adb_path],
-      },
-    }
-
   devil_chromium.Initialize(
       output_directory=constants.GetOutDirectory(),
-      custom_deps=devil_custom_deps)
+      adb_path=args.adb_path)
 
   apk = args.apk_path or args.apk_name
   if not apk.endswith('.apk'):
     apk += '.apk'
   if not os.path.exists(apk):
     apk = os.path.join(constants.GetOutDirectory(), 'apks', apk)
     if not os.path.exists(apk):
       parser.error('%s not found.' % apk)
 
   if args.splits:
@@ skipping 34 matching lines @@
       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())