[polymer] Merge of master into polymer10-migration

devil/devil/android/tools/device_status.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 keep track of devices across builds and report state."""
 
 import argparse
 import json
 import logging
@@ skipping 240 matching lines @@
                       help='If set, overwrites known devices files wiht new '
                            'values.')
 
 def main():
   parser = argparse.ArgumentParser()
   AddArguments(parser)
   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 = 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)]
 
@@ skipping 14 matching lines @@
   # Dump the device statuses to JSON.
   if args.json_output:
     with open(args.json_output, 'wb') as f:
       f.write(json.dumps(statuses, indent=4))
 
   live_devices = [status['serial'] for status in statuses
                   if (status['adb_status'] == 'device'
                       and not IsBlacklisted(status['serial'], blacklist))]
 
   # If all devices failed, or if there are no devices, it's an infra error.
+  if not live_devices:
+    logging.error('No available devices.')
   return 0 if live_devices else exit_codes.INFRA
 
 
 if __name__ == '__main__':
   sys.exit(main())