diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-09-10 08:38:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 15:39:01 +0000 |
| commit | 7555cbb5daf4fb30cb56de9ed4dd8bcd565b5cf6 (patch) | |
| tree | f9ca24fd9a4a2c06cb276ab35329c51b626f5b97 /build/android/enable_asserts.py | |
| parent | 2060555615aa5210b0a002f629575372aaf19844 (diff) | |
| download | chromium_src-7555cbb5daf4fb30cb56de9ed4dd8bcd565b5cf6.zip chromium_src-7555cbb5daf4fb30cb56de9ed4dd8bcd565b5cf6.tar.gz chromium_src-7555cbb5daf4fb30cb56de9ed4dd8bcd565b5cf6.tar.bz2 | |
[Android] Don't use a device blacklist if one isn't provided. (RELAND)
This is a reland of https://codereview.chromium.org/1314823011
BUG=517709
Review URL: https://codereview.chromium.org/1304303006
Cr-Commit-Position: refs/heads/master@{#348158}
Diffstat (limited to 'build/android/enable_asserts.py')
| -rwxr-xr-x | build/android/enable_asserts.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/android/enable_asserts.py b/build/android/enable_asserts.py index 1c60277..0616567 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. |