diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-09-11 10:23:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-11 17:23:59 +0000 |
| commit | a583ba3c77f32c0a1c4a870d5d8734b003150396 (patch) | |
| tree | c8524c3e047c2afc76a234b9d59bc50ee8b0edd4 /build/android/update_verification.py | |
| parent | 61f5ad7107405f414b1b14ddff712388ecece98c (diff) | |
| download | chromium_src-a583ba3c77f32c0a1c4a870d5d8734b003150396.zip chromium_src-a583ba3c77f32c0a1c4a870d5d8734b003150396.tar.gz chromium_src-a583ba3c77f32c0a1c4a870d5d8734b003150396.tar.bz2 | |
[Android] Don't use a device blacklist if one isn't provided. (RELAND 2)
original: https://codereview.chromium.org/1314823011
reland 1: https://codereview.chromium.org/1304303006
BUG=517709
TBR=rnephew@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1331213004
Cr-Commit-Position: refs/heads/master@{#348418}
Diffstat (limited to 'build/android/update_verification.py')
| -rwxr-xr-x | build/android/update_verification.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/android/update_verification.py b/build/android/update_verification.py index 4731c65..bdd49f1a 100755 --- a/build/android/update_verification.py +++ b/build/android/update_verification.py @@ -87,10 +87,9 @@ def main(): args = parser.parse_args() run_tests_helper.SetLogLevel(args.verbose) - 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) devices = device_utils.DeviceUtils.HealthyDevices(blacklist) if not devices: |