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

build/android/provision_devices.py

Index: build/android/provision_devices.py
diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
index 8c21f97ef200987db3d3432e4f26da2b67004d19..71575b5eec5d745d727febfc0cfb2d4ce56bb45e 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -296,6 +296,12 @@ def SetProperties(device, options):
 
   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)