| Index: build/android/provision_devices.py
|
| diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
|
| index 5f8fce274e6cd15bf6367ad701b80072b4719ab6..a9c6cd8d192bb14883b95c51d99a33813e62eae7 100755
|
| --- a/build/android/provision_devices.py
|
| +++ b/build/android/provision_devices.py
|
| @@ -22,6 +22,7 @@ import sys
|
| import time
|
|
|
| import devil_chromium
|
| +from devil import devil_env
|
| from devil.android import battery_utils
|
| from devil.android import device_blacklist
|
| from devil.android import device_errors
|
| @@ -470,6 +471,8 @@ def main():
|
| parser.add_argument('-d', '--device', metavar='SERIAL',
|
| help='the serial number of the device to be provisioned'
|
| ' (the default is to provision all devices attached)')
|
| + 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('--phase', action='append', choices=_PHASES.ALL,
|
| dest='phases',
|
| @@ -519,7 +522,15 @@ def main():
|
|
|
| run_tests_helper.SetLogLevel(args.verbose)
|
|
|
| - devil_chromium.Initialize()
|
| + devil_custom_deps = None
|
| + if args.adb_path:
|
| + devil_custom_deps = {
|
| + 'adb': {
|
| + devil_env.GetPlatform(): [args.adb_path],
|
| + },
|
| + }
|
| +
|
| + devil_chromium.Initialize(custom_deps=devil_custom_deps)
|
|
|
| return ProvisionDevices(args)
|
|
|
|
|