summaryrefslogtreecommitdiffstats
path: root/build/android
diff options
context:
space:
mode:
authorppi@chromium.org <ppi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-23 23:28:00 +0000
committerppi@chromium.org <ppi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-23 23:28:00 +0000
commit9a0f030df471a7d8df41a8258631b0063adc815c (patch)
treedfa364d43800b2c011201de6828e76baaa696ded /build/android
parentb429665083db187ca593384fa002c5d4b87af4dd (diff)
downloadchromium_src-9a0f030df471a7d8df41a8258631b0063adc815c.zip
chromium_src-9a0f030df471a7d8df41a8258631b0063adc815c.tar.gz
chromium_src-9a0f030df471a7d8df41a8258631b0063adc815c.tar.bz2
Fix build/android/enable_asserts.py.
The script seems to have been broken in https://codereview.chromium.org/221823011 (missing device serial when creating DeviceUtils). This fixes the script by iterating over all connected devices. BUG=267773 Review URL: https://codereview.chromium.org/249533002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
-rwxr-xr-xbuild/android/enable_asserts.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/build/android/enable_asserts.py b/build/android/enable_asserts.py
index 1823899..9ed402e 100755
--- a/build/android/enable_asserts.py
+++ b/build/android/enable_asserts.py
@@ -6,6 +6,7 @@
"""Enables dalvik vm asserts in the android device."""
+from pylib import android_commands
from pylib.device import device_utils
import optparse
import sys
@@ -21,10 +22,13 @@ def main(argv):
help='Removes the dalvik.vm.enableassertions property')
options, _ = option_parser.parse_args(argv)
- device = device_utils.DeviceUtils()
- if options.set_asserts != None:
- if device.old_interface.SetJavaAssertsEnabled(options.set_asserts):
- device.old_interface.Reboot(full_reboot=False)
+ # TODO(jbudorick): Accept optional serial number and run only for the
+ # specified device when present.
+ devices = android_commands.GetAttachedDevices()
+ for device in [device_utils.DeviceUtils(serial) for serial in devices]:
+ if options.set_asserts != None:
+ if device.old_interface.SetJavaAssertsEnabled(options.set_asserts):
+ device.old_interface.Reboot(full_reboot=False)
if __name__ == '__main__':