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

Unified Diff: build/android/enable_asserts.py

Issue 1304303006: [Android] Don't use a device blacklist if one isn't provided. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add blacklist to host_info and the old buildbot scripts 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 | « build/android/devil/android/device_utils.py ('k') | build/android/provision_devices.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/enable_asserts.py
diff --git a/build/android/enable_asserts.py b/build/android/enable_asserts.py
index 1c6027744b5bb44ee3e9ec8857e69b71865e7256..0616567acbdae89984c6490365632423f43c531d 100755
--- a/build/android/enable_asserts.py
+++ b/build/android/enable_asserts.py
@@ -28,10 +28,9 @@ def main():
args = parser.parse_args()
- if args.blacklist_file:
- blacklist = device_blacklist.Blacklist(args.blacklist_file)
- else:
- blacklist = None
+ blacklist = (device_blacklist.Blacklist(args.blacklist_file)
+ if args.blacklist_file
+ else None)
# TODO(jbudorick): Accept optional serial number and run only for the
# specified device when present.
« no previous file with comments | « build/android/devil/android/device_utils.py ('k') | build/android/provision_devices.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698