| Index: devil/devil/android/tools/device_recovery.py
|
| diff --git a/devil/devil/android/tools/device_recovery.py b/devil/devil/android/tools/device_recovery.py
|
| index e6456a70d2ea1519d0f1db056bd5a0cec6e67f3d..ae64b511efe78ee8670e96ba565478f97ae85c4e 100755
|
| --- a/devil/devil/android/tools/device_recovery.py
|
| +++ b/devil/devil/android/tools/device_recovery.py
|
| @@ -169,21 +169,11 @@ def main():
|
| args = parser.parse_args()
|
| run_tests_helper.SetLogLevel(args.verbose)
|
|
|
| - devil_dynamic_config = {
|
| - 'config_type': 'BaseConfig',
|
| - 'dependencies': {},
|
| - }
|
| -
|
| + devil_dynamic_config = devil_env.EmptyConfig()
|
| if args.adb_path:
|
| - devil_dynamic_config['dependencies'].update({
|
| - 'adb': {
|
| - 'file_info': {
|
| - devil_env.GetPlatform(): {
|
| - 'local_paths': [args.adb_path]
|
| - }
|
| - }
|
| - }
|
| - })
|
| + devil_dynamic_config['dependencies'].update(
|
| + devil_env.LocalConfigItem(
|
| + 'adb', devil_env.GetPlatform(), args.adb_path))
|
| devil_env.config.Initialize(configs=[devil_dynamic_config])
|
|
|
| blacklist = (device_blacklist.Blacklist(args.blacklist_file)
|
|
|