[build] Refactor DEPS so "git_revision:xyz" is not split.

Change-Id: I60d214ff36d7d05a0cc590ca57772128d983f856
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/263682
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Ryan Macnak 2022-10-12 18:58:59 +00:00 committed by Commit Queue
parent 20af356c79
commit 17af3a4005

22
DEPS
View file

@ -74,11 +74,11 @@ vars = {
# The list of revisions for these tools comes from Fuchsia, here:
# https://fuchsia.googlesource.com/integration/+/HEAD/toolchain
# If there are problems with the toolchain, contact fuchsia-toolchain@.
"clang_revision": "60d276923902051192eba692e5312e605c9d9f65",
"gn_revision": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a",
"clang_version": "git_revision:60d276923902051192eba692e5312e605c9d9f65",
"gn_version": "git_revision:0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a",
# Update from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/gn
"fuchsia_sdk_revision": "8658717573be7924d71b88c3d404ea2b4ca4984b",
"fuchsia_sdk_version": "git_revision:8658717573be7924d71b88c3d404ea2b4ca4984b",
# Ninja, runs the build based on files generated by GN.
"ninja_tag": "version:2@1.11.1.chromium.4",
@ -464,7 +464,7 @@ deps = {
"packages": [
{
"package": "fuchsia/third_party/clang/linux-amd64",
"version": "git_revision:" + Var("clang_revision"),
"version": Var("clang_version"),
},
],
"condition": "host_cpu == x64 and host_os == linux",
@ -474,7 +474,7 @@ deps = {
"packages": [
{
"package": "fuchsia/third_party/clang/mac-amd64",
"version": "git_revision:" + Var("clang_revision"),
"version": Var("clang_version"),
},
],
"condition": "host_os == mac", # On ARM64 Macs too because Goma doesn't support the host-arm64 toolchain.
@ -484,7 +484,7 @@ deps = {
"packages": [
{
"package": "fuchsia/third_party/clang/windows-amd64",
"version": "git_revision:" + Var("clang_revision"),
"version": Var("clang_version"),
},
],
"condition": "host_cpu == x64 and host_os == win",
@ -494,7 +494,7 @@ deps = {
"packages": [
{
"package": "fuchsia/third_party/clang/linux-arm64",
"version": "git_revision:" + Var("clang_revision"),
"version": Var("clang_version"),
},
],
"condition": "host_os == 'linux' and host_cpu == 'arm64'",
@ -504,7 +504,7 @@ deps = {
"packages": [
{
"package": "fuchsia/third_party/clang/mac-arm64",
"version": "git_revision:" + Var("clang_revision"),
"version": Var("clang_version"),
},
],
"condition": "host_os == 'mac' and host_cpu == 'arm64'",
@ -526,7 +526,7 @@ deps = {
"packages": [
{
"package": "gn/gn/${{platform}}",
"version": "git_revision:" + Var("gn_revision"),
"version": Var("gn_version"),
},
],
"dep_type": "cipd",
@ -599,7 +599,7 @@ deps = {
"packages": [
{
"package": "fuchsia/sdk/gn/mac-amd64",
"version": "git_revision:" + Var("fuchsia_sdk_revision"),
"version": Var("fuchsia_sdk_version"),
}
],
"condition": 'host_os == "mac" and host_cpu == "x64"',
@ -609,7 +609,7 @@ deps = {
"packages": [
{
"package": "fuchsia/sdk/gn/linux-amd64",
"version": "git_revision:" + Var("fuchsia_sdk_revision"),
"version": Var("fuchsia_sdk_version"),
}
],
"condition": 'host_os == "linux" and host_cpu == "x64"',