Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: build/android/adb_install_apk.py

Issue 1314823011: [Android] Don't use a device blacklist if one isn't provided. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/adb_reverse_forwarder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « no previous file | build/android/adb_reverse_forwarder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698