Commit 3c9f5858 authored by Stephen Roe's avatar Stephen Roe Committed by Commit Bot

Reland "Add third_party/qemu-linux-arm64 to DEPS runhooks."

This is a reland of 8db01995
after fixing https://b.corp.google.com/issues/143701391

It adds the parentheses changes from
https://chromium-review.googlesource.com/c/chromium/src/+/1893190

Original change's description:
> Add third_party/qemu-linux-arm64 to DEPS runhooks.
>
> qemu-linux-arm64 is from the /fuchsia/qemu/linux-arm64 CIPD package.
>
> Bug: 1015177
> Change-Id: Ie193d18e4b52059ad853cee07075979b1faea038
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865751
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
> Commit-Queue: Stephen Roe <steveroe@google.com>
> Cr-Commit-Position: refs/heads/master@{#708478}

Bug: 1015177
Change-Id: I27c848336a3466ef2aa2801d29b7b850fd0411d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1913570
Auto-Submit: Stephen Roe <steveroe@google.com>
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714972}
parent b1fd15af
......@@ -122,6 +122,10 @@ vars = {
# Wildcards are supported (e.g. "qemu.*").
'checkout_fuchsia_boot_images': "qemu.x64,qemu.arm64",
# By default, do not check out files required to run fuchsia tests in
# qemu on linux-arm64 machines.
'checkout_fuchsia_for_arm64_host': False,
# By Default, do not checkout AEMU, as it is too big. This can be overridden
# e.g. with custom_vars.
# TODO(chonggu): Delete once AEMU package is small enough.
......@@ -941,6 +945,19 @@ deps = {
'condition': 'checkout_linux',
},
# TODO(steveroe): Get this from GCS instead of CIPD once the arm64 sdk is
# released using the same version specified in build/fuchsia/linux.sdk.sha1.
'src/third_party/fuchsia-sdk-arm64': {
'packages': [
{
'package': 'fuchsia/sdk/core/linux-arm64',
'version': 'J4QyYSv0T-30YSgD6d34XHRpck2ckNh-4MMhsRYj4zoC'
},
],
'condition': 'host_os == "linux" and (checkout_fuchsia and checkout_fuchsia_for_arm64_host)',
'dep_type': 'cipd',
},
'src/third_party/grpc/src': {
'url': Var('chromium_git') + '/external/github.com/grpc/grpc.git' + '@' + '74b981a6a3d9ba17f3acae1d72b9109325ef656d',
},
......@@ -1335,6 +1352,17 @@ deps = {
'src/third_party/pywebsocket/src':
Var('chromium_git') + '/external/github.com/google/pywebsocket.git' + '@' + '2d7b73c3acbd0f41dcab487ae5c97c6feae06ce2',
'src/third_party/qemu-linux-arm64': {
'packages': [
{
'package': 'fuchsia/qemu/linux-arm64',
'version': 'b1b61a39e3ab0935cd030f27e01740578b04b967'
},
],
'condition': 'host_os == "linux" and (checkout_fuchsia and checkout_fuchsia_for_arm64_host)',
'dep_type': 'cipd',
},
'src/third_party/qemu-linux-x64': {
'packages': [
{
......
......@@ -84,6 +84,7 @@
/freetype/src
/fuchsia-sdk/images
/fuchsia-sdk/sdk
/fuchsia-sdk-arm64
/gestures/gestures
/gles2_conform
/glfw/src
......@@ -194,6 +195,7 @@
/python_26
/pywebsocket/src
/pywebsocket/src
/qemu-linux-arm64
/qemu-linux-x64
/qemu-mac-x64
/quic_trace/src
......
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