Commit 2de75bbf authored by Chong Gu's avatar Chong Gu Committed by Commit Bot

[Fuchsia] Allow x64 FYI Fuchsia Bots to Use AEMU.


Add AEMU to fuchsia_package_runner template.
Add Mixin for AEMU flag, apply mixin to FYI Fuchsia Bots.
Add missing filter for components_unittests.

Bug: 1000906
Change-Id: I495074e7d811db850c43b60dfd6e1ae052702781
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1793522
Commit-Queue: Chong Gu <chonggu@google.com>
Reviewed-by: default avatarWez <wez@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704938}
parent 72e1b53f
...@@ -19,6 +19,7 @@ if (current_cpu == "arm64") { ...@@ -19,6 +19,7 @@ if (current_cpu == "arm64") {
} }
# Compute the qemu path. # Compute the qemu path.
aemu_root = "//third_party/aemu-${host_os}-${host_cpu}"
qemu_root = "//third_party/qemu-${host_os}-${host_cpu}" qemu_root = "//third_party/qemu-${host_os}-${host_cpu}"
# Compute the path to the arch-specific boot image directory. # Compute the path to the arch-specific boot image directory.
......
...@@ -97,6 +97,10 @@ template("fuchsia_package_runner") { ...@@ -97,6 +97,10 @@ template("fuchsia_package_runner") {
"${boot_image_root}/qemu/zircon-a.zbi", "${boot_image_root}/qemu/zircon-a.zbi",
] ]
if (host_cpu == "x64" && target_cpu == "x64") {
data += [ "${aemu_root}/" ]
}
executable_args = [] executable_args = []
package_paths = [ rebase_path(_package_path, root_build_dir) ] package_paths = [ rebase_path(_package_path, root_build_dir) ]
......
This diff is collapsed.
...@@ -193,6 +193,13 @@ ...@@ -193,6 +193,13 @@
}, },
}, },
}, },
'fuchsia_aemu': {
'$mixin_append': {
'args': [
'--device=aemu',
],
},
},
'gpu_pool': { 'gpu_pool': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
......
...@@ -1737,6 +1737,7 @@ ...@@ -1737,6 +1737,7 @@
'all', 'all',
], ],
'mixins': [ 'mixins': [
'fuchsia_aemu',
'linux-xenial', 'linux-xenial',
], ],
'swarming': { 'swarming': {
...@@ -1755,6 +1756,7 @@ ...@@ -1755,6 +1756,7 @@
'all', 'all',
], ],
'mixins': [ 'mixins': [
'fuchsia_aemu',
'linux-xenial', 'linux-xenial',
], ],
'swarming': { 'swarming': {
......
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