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

Side by Side Diff: build/android/enable_asserts.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 unified diff | Download patch
« no previous file with comments | « build/android/devil/android/device_utils.py ('k') | build/android/provision_devices.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # 2 #
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 """Enables dalvik vm asserts in the android device.""" 7 """Enables dalvik vm asserts in the android device."""
8 8
9 import argparse 9 import argparse
10 import sys 10 import sys
(...skipping 10 matching lines...) Expand all
21 set_asserts_group = parser.add_mutually_exclusive_group(required=True) 21 set_asserts_group = parser.add_mutually_exclusive_group(required=True)
22 set_asserts_group.add_argument( 22 set_asserts_group.add_argument(
23 '--enable_asserts', dest='set_asserts', action='store_true', 23 '--enable_asserts', dest='set_asserts', action='store_true',
24 help='Sets the dalvik.vm.enableassertions property to "all"') 24 help='Sets the dalvik.vm.enableassertions property to "all"')
25 set_asserts_group.add_argument( 25 set_asserts_group.add_argument(
26 '--disable_asserts', dest='set_asserts', action='store_false', 26 '--disable_asserts', dest='set_asserts', action='store_false',
27 help='Removes the dalvik.vm.enableassertions property') 27 help='Removes the dalvik.vm.enableassertions property')
28 28
29 args = parser.parse_args() 29 args = parser.parse_args()
30 30
31 blacklist = (device_blacklist.Blacklist(args.blacklist_file) 31 if args.blacklist_file:
32 if args.blacklist_file 32 blacklist = device_blacklist.Blacklist(args.blacklist_file)
33 else None) 33 else:
34 blacklist = None
34 35
35 # TODO(jbudorick): Accept optional serial number and run only for the 36 # TODO(jbudorick): Accept optional serial number and run only for the
36 # specified device when present. 37 # specified device when present.
37 devices = device_utils.DeviceUtils.parallel( 38 devices = device_utils.DeviceUtils.parallel(
38 device_utils.DeviceUtils.HealthyDevices(blacklist)) 39 device_utils.DeviceUtils.HealthyDevices(blacklist))
39 40
40 def set_java_asserts_and_restart(device): 41 def set_java_asserts_and_restart(device):
41 if device.SetJavaAsserts(args.set_asserts): 42 if device.SetJavaAsserts(args.set_asserts):
42 device.RunShellCommand('stop') 43 device.RunShellCommand('stop')
43 device.RunShellCommand('start') 44 device.RunShellCommand('start')
44 45
45 devices.pMap(set_java_asserts_and_restart) 46 devices.pMap(set_java_asserts_and_restart)
46 return 0 47 return 0
47 48
48 49
49 if __name__ == '__main__': 50 if __name__ == '__main__':
50 sys.exit(main()) 51 sys.exit(main())
OLDNEW
« no previous file with comments | « build/android/devil/android/device_utils.py ('k') | build/android/provision_devices.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698