build/android/screenshot.py - Issue 1304303006: [Android] Don't use a device blacklist if one isn't provided. (RELAND)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/screenshot.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

Index: build/android/screenshot.py

diff --git a/build/android/screenshot.py b/build/android/screenshot.py

index a0a52afe7b0f3c9611323a0b9297be44f8ebbfe7..839fb55d91eee07dae45da34686b8e72d68a5e2c 100755

--- a/build/android/screenshot.py

+++ b/build/android/screenshot.py

@@ -76,10 +76,9 @@ def main():

if options.verbose:

logging.getLogger().setLevel(logging.DEBUG)

- if options.blacklist_file:

- blacklist = device_blacklist.Blacklist(options.blacklist_file)

- else:

- blacklist = None

+ blacklist = (device_blacklist.Blacklist(options.blacklist_file)

+ if options.blacklist_file

+ else None)

devices = device_utils.DeviceUtils.HealthyDevices(blacklist)

if options.device:

« no previous file with comments | « build/android/pylib/local/device/local_device_environment.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »