| Index: build/android/buildbot/bb_device_status_check.py
|
| diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py
|
| index 5ea295e3c347be73f086e3d97c933db5e084716a..0e4107807956c3f2ff2403f63ca528d9ae1fb911 100755
|
| --- a/build/android/buildbot/bb_device_status_check.py
|
| +++ b/build/android/buildbot/bb_device_status_check.py
|
| @@ -17,7 +17,6 @@ import sys
|
|
|
| sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
|
| 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
|
| @@ -310,7 +309,7 @@ def main():
|
| 'This script now always tries to reset USB.')
|
| parser.add_argument('--json-output',
|
| help='Output JSON information into a specified file.')
|
| - parser.add_argument('--adb-path',
|
| + parser.add_argument('--adb-path', type=os.path.abspath,
|
| help='Absolute path to the adb binary to use.')
|
| parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
|
| parser.add_argument('--known-devices-file', action='append', default=[],
|
| @@ -323,15 +322,7 @@ def main():
|
|
|
| run_tests_helper.SetLogLevel(args.verbose)
|
|
|
| - 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)
|
| + devil_chromium.Initialize(adb_path=args.adb_path)
|
|
|
| blacklist = (device_blacklist.Blacklist(args.blacklist_file)
|
| if args.blacklist_file
|
|
|