| Index: build/android/test_runner.py
|
| diff --git a/build/android/test_runner.py b/build/android/test_runner.py
|
| index c1f1e2a5b38bd975d6130887a5174ce447242443..e4e95459c49c98bf981a0d1c58b8040eb85f8b88 100755
|
| --- a/build/android/test_runner.py
|
| +++ b/build/android/test_runner.py
|
| @@ -18,7 +18,6 @@ import unittest
|
|
|
| import devil_chromium
|
| from devil import base_error
|
| -from devil import devil_env
|
| from devil.android import device_blacklist
|
| from devil.android import device_errors
|
| from devil.android import device_utils
|
| @@ -140,17 +139,9 @@ def ProcessCommonOptions(args):
|
| if args.output_directory:
|
| constants.SetOutputDirectory(args.output_directory)
|
|
|
| - 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)
|
|
|
| # Some things such as Forwarder require ADB to be in the environment path.
|
| adb_dir = os.path.dirname(constants.GetAdbPath())
|
|
|