build/android/adb_install_apk.py - Issue 1334803002: Revert of [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/adb_install_apk.py

Issue 1334803002: Revert of [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: 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/adb_install_apk.py

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

index 011509bb38eb6cb6848d1db4ce69cfd5fc932a83..e392a39fbfa8eec307bbc3ab9ad0ba5ac36b7dc9 100755

--- a/build/android/adb_install_apk.py

+++ b/build/android/adb_install_apk.py

@@ -83,9 +83,12 @@

and helper.GetSplitName()):

splits.append(f)

- blacklist = (device_blacklist.Blacklist(args.blacklist_file)

- if args.blacklist_file

- else None)

+ 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)

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 »