[polymer] Merge of master into polymer10-migration

devil/devil/android/tools/device_recovery.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """A script to recover devices in a known bad state."""
 
 import argparse
 import logging
 import os
@@ skipping 150 matching lines @@
   parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
   parser.add_argument('--known-devices-file', action='append', default=[],
                       dest='known_devices_files',
                       help='Path to known device lists.')
   parser.add_argument('-v', '--verbose', action='count', default=1,
                       help='Log more information.')
 
   args = parser.parse_args()
   run_tests_helper.SetLogLevel(args.verbose)
 
-  devil_custom_deps = None
+  devil_dynamic_config = {
+    'config_type': 'BaseConfig',
+    'dependencies': {},
+  }
+
   if args.adb_path:
-    devil_custom_deps = {
-      'adb': {
-        devil_env.GetPlatform(): [args.adb_path],
-      },
-    }
-  devil_env.config.Initialize(configs=devil_custom_deps)
+    devil_dynamic_config['dependencies'].update({
+        'adb': {
+          'file_info': {
+            devil_env.GetPlatform(): {
+              'local_paths': [args.adb_path]
+            }
+          }
+        }
+    })
+  devil_env.config.Initialize(configs=[devil_dynamic_config])
 
   blacklist = (device_blacklist.Blacklist(args.blacklist_file)
                if args.blacklist_file
                else None)
 
   expected_devices = device_status.GetExpectedDevices(args.known_devices_files)
   usb_devices = set(lsusb.get_android_devices())
   devices = [device_utils.DeviceUtils(s)
              for s in expected_devices.union(usb_devices)]
 
   RecoverDevices(devices, blacklist)
 
 
 if __name__ == '__main__':
   sys.exit(main())