Update DEPS for buildtools on analyzer-0.33 branch to match origin/master.
This should hopefully be sufficient to get bots passing on the
analyzer-0.33 branch.
Updated to origin/master as of b18de843b565b9331caac9672ab0f90ebee25b60.
Change-Id: I168171b522e936f029e44eb216709c404c745c13
Reviewed-on: https://dart-review.googlesource.com/c/86685
Reviewed-by: Paul Berry <paulberry@google.com>
diff --git a/DEPS b/DEPS
index bccc28f..7ea7791 100644
--- a/DEPS
+++ b/DEPS
@@ -38,11 +38,13 @@
"co19_2_rev": "92eb86a60b26089eaffc4fa9703895f71a251a76",
- # As Flutter does, we pull buildtools, including the clang toolchain, from
- # Fuchsia. This revision should be kept up to date with the revision pulled
- # by the Flutter engine. If there are problems with the toolchain, contact
- # fuchsia-toolchain@.
- "buildtools_revision": "446d5b1019dcbe7835236dc85261e91cf29a9239",
+ # As Flutter does, we use Fuchsia's GN and Clang toolchain. These revision
+ # should be kept up to date with the revisions pulled by the Flutter engine.
+ # The list of revisions for these tools comes from Fuchsia, here:
+ # https://fuchsia.googlesource.com/buildtools/+/master/fuchsia.ensure
+ # If there are problems with the toolchain, contact fuchsia-toolchain@.
+ "clang_revision": "de39621f0f03f20633bdfa50bde97a3908bf6e98",
+ "gn_revision": "bdb0fd02324b120cacde634a9235405061c8ea06",
# Scripts that make 'git cl format' work.
"clang_format_scripts_rev": "c09c8deeac31f05bd801995c475e7c8070f9ecda",
@@ -152,8 +154,6 @@
deps = {
# Stuff needed for GN build.
- Var("dart_root") + "/buildtools":
- Var("fuchsia_git") + "/buildtools" + "@" + Var("buildtools_revision"),
Var("dart_root") + "/buildtools/clang_format/script":
Var("chromium_git") + "/chromium/llvm-project/cfe/tools/clang-format.git" +
"@" + Var("clang_format_scripts_rev"),
@@ -379,6 +379,27 @@
"@" + Var("web_socket_channel_tag"),
Var("dart_root") + "/third_party/pkg/yaml":
Var("dart_git") + "yaml.git" + "@" + Var("yaml_tag"),
+
+ Var("dart_root") + "/buildtools/" + Var("host_os") + "-" + Var("host_cpu") + "/clang": {
+ "packages": [
+ {
+ "package": "fuchsia/clang/${{platform}}",
+ "version": "git_revision:" + Var("clang_revision"),
+ },
+ ],
+ "condition": "(host_os == 'linux' or host_os == 'mac') and (host_cpu == 'x64' or host_cpu == 'arm64')",
+ "dep_type": "cipd",
+ },
+
+ Var("dart_root") + "/buildtools": {
+ "packages": [
+ {
+ "package": "gn/gn/${{platform}}",
+ "version": "git_revision:" + Var("gn_revision"),
+ },
+ ],
+ "dep_type": "cipd",
+ },
}
deps_os = {
