Commit d531c0f1 authored by John Budorick's avatar John Budorick Committed by Commit Bot

android: start emulator with -writable-system for web{layer,view}.

Bug: 922145
Change-Id: I76762e87da7ef042b36dedfc12912822328d72c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1988988Reviewed-by: default avatarAndrew Luo <aluo@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729780}
parent a49a594b
...@@ -28,6 +28,11 @@ class LocalEmulatorEnvironment(local_device_environment.LocalDeviceEnvironment): ...@@ -28,6 +28,11 @@ class LocalEmulatorEnvironment(local_device_environment.LocalDeviceEnvironment):
logging.warning('--emulator-count capped at 16.') logging.warning('--emulator-count capped at 16.')
self._emulator_count = min(_MAX_ANDROID_EMULATORS, args.emulator_count) self._emulator_count = min(_MAX_ANDROID_EMULATORS, args.emulator_count)
self._emulator_window = args.emulator_window self._emulator_window = args.emulator_window
self._writable_system = ((hasattr(args, 'use_webview_provider')
and args.use_webview_provider)
or (hasattr(args, 'replace_system_package')
and args.replace_system_package))
self._emulator_instances = [] self._emulator_instances = []
self._device_serials = [] self._device_serials = []
...@@ -43,7 +48,9 @@ class LocalEmulatorEnvironment(local_device_environment.LocalDeviceEnvironment): ...@@ -43,7 +48,9 @@ class LocalEmulatorEnvironment(local_device_environment.LocalDeviceEnvironment):
def impl(e): def impl(e):
try: try:
e.Start(window=self._emulator_window) e.Start(
window=self._emulator_window,
writable_system=self._writable_system)
except avd.AvdException: except avd.AvdException:
logging.exception('Failed to start emulator instance.') logging.exception('Failed to start emulator instance.')
return None return None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment