summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authornavabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-23 18:15:00 +0000
committernavabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-23 18:15:00 +0000
commita21b9002f6f160451ab226d044fe7d3d121f1b07 (patch)
tree0111a0582b9062371c70b8e915af173a06858ccb /build
parent4858e43121ea40123e3b229320fccb88063cf4af (diff)
downloadchromium_src-a21b9002f6f160451ab226d044fe7d3d121f1b07.zip
chromium_src-a21b9002f6f160451ab226d044fe7d3d121f1b07.tar.gz
chromium_src-a21b9002f6f160451ab226d044fe7d3d121f1b07.tar.bz2
Enable checkjni for non-perf bots.
BUG=321755 Review URL: https://codereview.chromium.org/344273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/provision_devices.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
index 9f14a09f..4104425 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -72,7 +72,7 @@ def PushAndLaunchAdbReboot(devices, target):
LaunchHostHeartbeat()
-def _ConfigureLocalProperties(device):
+def _ConfigureLocalProperties(device, is_perf):
"""Set standard readonly testing device properties prior to reboot."""
local_props = [
'ro.monkey=1',
@@ -80,6 +80,9 @@ def _ConfigureLocalProperties(device):
'ro.audio.silent=1',
'ro.setupwizard.mode=DISABLED',
]
+ if not is_perf:
+ local_props.append('%s=all' % android_commands.JAVA_ASSERT_PROPERTY)
+ local_props.append('debug.checkjni=1')
device.old_interface.SetProtectedFileContents(
constants.DEVICE_LOCAL_PROPERTIES_PATH,
'\n'.join(local_props))
@@ -121,6 +124,7 @@ def WipeDeviceData(device):
def ProvisionDevices(options):
+ is_perf = 'perf' in os.environ.get('BUILDBOT_BUILDERNAME', '').lower()
# TODO(jbudorick): Parallelize provisioning of all attached devices after
# switching from AndroidCommands.
if options.device is not None:
@@ -145,14 +149,14 @@ def ProvisionDevices(options):
for device_serial in devices:
device = device_utils.DeviceUtils(device_serial)
device.old_interface.EnableAdbRoot()
- _ConfigureLocalProperties(device)
+ _ConfigureLocalProperties(device, is_perf)
device_settings_map = device_settings.DETERMINISTIC_DEVICE_SETTINGS
if options.disable_location:
device_settings_map.update(device_settings.DISABLE_LOCATION_SETTING)
else:
device_settings_map.update(device_settings.ENABLE_LOCATION_SETTING)
device_settings.ConfigureContentSettingsDict(device, device_settings_map)
- if 'perf' in os.environ.get('BUILDBOT_BUILDERNAME', '').lower():
+ if is_perf:
# TODO(tonyg): We eventually want network on. However, currently radios
# can cause perfbots to drain faster than they charge.
device_settings.ConfigureContentSettingsDict(