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 7cd6cd044f26343b95b280af6e56a0a6fcca2561..9d54fe3747733c8175a888dc97eb651e23a30987 100755 |
--- a/build/android/buildbot/bb_device_status_check.py |
+++ b/build/android/buildbot/bb_device_status_check.py |
@@ -295,11 +295,9 @@ def main(): |
run_tests_helper.SetLogLevel(args.verbose) |
- if args.blacklist_file: |
- blacklist = device_blacklist.Blacklist(args.blacklist_file) |
- else: |
- # TODO(jbudorick): Remove this once bots pass the blacklist file. |
- blacklist = device_blacklist.Blacklist(device_blacklist.BLACKLIST_JSON) |
+ blacklist = (device_blacklist.Blacklist(args.blacklist_file) |
+ if args.blacklist_file |
+ else None) |
last_devices_path = os.path.join( |
args.out_dir, device_list.LAST_DEVICES_FILENAME) |