Index: build/android/adb_install_apk.py |
diff --git a/build/android/adb_install_apk.py b/build/android/adb_install_apk.py |
index e00981fb8b8420068da2c477f673d4651fb4df62..4f299efaac40da84eb158a0c3eaf41b8b24073ea 100755 |
--- a/build/android/adb_install_apk.py |
+++ b/build/android/adb_install_apk.py |
@@ -83,12 +83,9 @@ def main(): |
and helper.GetSplitName()): |
splits.append(f) |
- if args.blacklist_file: |
- blacklist = device_blacklist.Blacklist(args.blacklist_file) |
- else: |
- # TODO(jbudorick): Remove this once the bots are converted. |
- blacklist = device_blacklist.Blacklist(device_blacklist.BLACKLIST_JSON) |
- |
+ blacklist = (device_blacklist.Blacklist(args.blacklist_file) |
+ if args.blacklist_file |
+ else None) |
devices = device_utils.DeviceUtils.HealthyDevices(blacklist) |
if args.device: |