Commit 29ae8dd6 authored by Chong Gu's avatar Chong Gu Committed by Commit Bot

[Fuchsia] Use AEMU by default on x64 hosts.

Remove the need for --device arg on our FYI and CI bots.

Change-Id: I8115f2d2246b1385d8695926a84a8df51c833214
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2277422Reviewed-by: default avatarRobert Ma <robertma@chromium.org>
Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Chong Gu <chonggu@google.com>
Cr-Commit-Position: refs/heads/master@{#796957}
parent 2913aaaa
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -270,13 +270,6 @@ ...@@ -270,13 +270,6 @@
}, },
}, },
}, },
'fuchsia_aemu': {
'$mixin_append': {
'args': [
'--device=aemu',
],
},
},
'fuchsia_runner_logs': { 'fuchsia_runner_logs': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
......
...@@ -2018,7 +2018,6 @@ ...@@ -2018,7 +2018,6 @@
'all', 'all',
], ],
'mixins': [ 'mixins': [
'fuchsia_aemu',
'linux-xenial', 'linux-xenial',
], ],
'swarming': { 'swarming': {
...@@ -2039,7 +2038,6 @@ ...@@ -2039,7 +2038,6 @@
'browser_config': 'web-engine-shell', 'browser_config': 'web-engine-shell',
'os_type': 'linux', 'os_type': 'linux',
'mixins': [ 'mixins': [
'fuchsia_aemu',
'linux-xenial', 'linux-xenial',
], ],
'swarming': { 'swarming': {
...@@ -4082,7 +4080,6 @@ ...@@ -4082,7 +4080,6 @@
'browser_config': 'web-engine-shell', 'browser_config': 'web-engine-shell',
'os_type': 'linux', 'os_type': 'linux',
'mixins': [ 'mixins': [
'fuchsia_aemu',
'linux-xenial', 'linux-xenial',
], ],
'swarming': { 'swarming': {
......
...@@ -142,17 +142,16 @@ def parse_args(args): ...@@ -142,17 +142,16 @@ def parse_args(args):
action='store_true', action='store_true',
default=True, default=True,
help=('Log Zircon debug messages (enabled by default).')), help=('Log Zircon debug messages (enabled by default).')),
optparse.make_option( optparse.make_option('--no-zircon-logging',
'--no-zircon-logging', dest='zircon_logging',
dest='zircon_logging', action='store_false',
action='store_false', default=True,
default=True, help=('Do not log Zircon debug messages.')),
help=('Do not log Zircon debug messages.')), optparse.make_option('--device',
optparse.make_option( choices=['aemu', 'qemu'],
'--device', default='aemu',
choices=['aemu', 'qemu'], help=('Choose device to launch Fuchsia with. '
default='qemu', 'Defaults to AEMU.')),
help=('Choose device to launch Fuchsia with.')),
])) ]))
option_group_definitions.append(( option_group_definitions.append((
......
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