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

Unified Diff: build/android/enable_asserts.py

Issue 1281923003: [Android] Add --blacklist-file as a command-line option. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix telemetry_unittests Created 5 years, 4 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/buildbot/bb_device_steps.py ('k') | build/android/host_heartbeat.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 8fb7dca4725fe884af73115b0751d68d74f99940..b33e2120ae7c6cfcc09a57640b696f59f2810a8b 100755
--- a/build/android/enable_asserts.py
+++ b/build/android/enable_asserts.py
@@ -9,12 +9,15 @@
import argparse
import sys
+from pylib.device import device_blacklist
from pylib.device import device_utils
def main():
parser = argparse.ArgumentParser()
+ parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
+
set_asserts_group = parser.add_mutually_exclusive_group(required=True)
set_asserts_group.add_argument(
'--enable_asserts', dest='set_asserts', action='store_true',
@@ -25,9 +28,15 @@ def main():
args = parser.parse_args()
+ if args.blacklist_file:
+ blacklist = device_blacklist.Blacklist(args.blacklist_file)
+ else:
+ blacklist = None
+
# TODO(jbudorick): Accept optional serial number and run only for the
# specified device when present.
- devices = device_utils.DeviceUtils.parallel()
+ devices = device_utils.DeviceUtils.parallel(
+ device_utils.DeviceUtils.HealthyDevices(blacklist))
def set_java_asserts_and_restart(device):
if device.SetJavaAsserts(args.set_asserts):
« no previous file with comments | « build/android/buildbot/bb_device_steps.py ('k') | build/android/host_heartbeat.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698