Change provision_devices.py to disable verity for remove webview on M

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 278 matching lines @@
     device_settings.ConfigureContentSettings(
         device, device_settings.NETWORK_DISABLED_SETTINGS)
 
   if options.disable_system_chrome:
     # The system chrome version on the device interferes with some tests.
     device.RunShellCommand(['pm', 'disable', 'com.android.chrome'],
                            check_return=True)
 
   if options.remove_system_webview:
     if device.HasRoot():
+      # Disabled Marshmallow's Verity security feature
+      if device.build_version_sdk >= version_codes.MARSHMALLOW:
+        device.adb.DisableVerity()
+        device.Reboot()

[jbudorick, 2016/05/09 21:07:33]

I'm not crazy about introducing yet another reboot here. Is it necessary? Could
we instead split this across one of the reboots we already do?

[Yoland Yan(Google), 2016/05/09 22:49:36]

hmm, I don't think there is a good place to include, previous reboots is
included is done by run_phase, which shouldn't include any commandline argument
specific action.

Also, I changed so that this only happens once on device as Mike suggested

+        device.adb.WaitForDevice()

[jbudorick, 2016/05/09 21:07:33]

If we keep this, this should change to device.WaitUntilFullyBooted

[Yoland Yan(Google), 2016/05/09 22:49:36]

Done.

+        device.EnableRoot()
       # This is required, e.g., to replace the system webview on a device.
       device.adb.Remount()
       device.RunShellCommand(['stop'], check_return=True)
       device.RunShellCommand(['rm', '-rf'] + _SYSTEM_WEBVIEW_PATHS,

[mikecase (-- gone --), 2016/05/09 21:09:55]

I think maybe what we should fix is that none of this has to run if the
SYSTEM_WEBVIEW_PATHS have already been removed. My vote would be check if the
system webview paths exist before doing any of this. In this case, even if we
leave the reboot, it should only happen once (the first run) after the device
has been flashed.

[Yoland Yan(Google), 2016/05/09 22:49:36]

Done.

                              check_return=True)
       device.RunShellCommand(['start'], check_return=True)
     else:
       logging.warning('Cannot remove system webview from a non-rooted device')
 
   # Some device types can momentarily disappear after setting properties.
   device.adb.WaitForDevice()
 
 
 def _ConfigureLocalProperties(device, java_debug=True):
@@ skipping 223 matching lines @@
       },
     }
 
   devil_chromium.Initialize(custom_deps=devil_custom_deps)
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())