Pull buildtools DEPS directly instead of via recursedeps

DEPS

@@ -85,6 +85,54 @@ deps = {
     'condition': 'not build_with_chromium',
   },
 
+  'buildtools/clang_format/script': {
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@99803d74e35962f63a775f29477882afd4d57d94',
+    'condition': 'not build_with_chromium',
+  },
+
+  'buildtools/linux64': {
+    'packages': [
+      {
+        'package': 'gn/gn/linux-amd64',
+        'version': 'git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3',
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'not build_with_chromium and host_os == "linux"',
+  },
+
+  'buildtools/mac': {
+    'packages': [
+      {
+        'package': 'gn/gn/mac-${{arch}}',
+        'version': 'git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3',
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'not build_with_chromium and host_os == "mac"',
+  },
+
+  'buildtools/third_party/libc++/trunk': {
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@8fa87946779682841e21e2da977eccfb6cb3bded',
+    'condition': 'not build_with_chromium',
+  },
+
+  'buildtools/third_party/libc++abi/trunk': {
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@6918862bfc2bff22b45058fac22b1596c49982fb',
+    'condition': 'not build_with_chromium',
+  },
+
+  'buildtools/win': {
+    'packages': [
+      {
+        'package': 'gn/gn/windows-amd64',
+        'version': 'git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3',
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'not build_with_chromium and host_os == "win"',
+  },
+
   'testing': {
     'url': '{chromium_git}/chromium/src/testing@4138b13c164ce60bb99115a078957b7a952ce32f',
     'condition': 'not build_with_chromium',
@@ -485,8 +533,6 @@ hooks = [
 ]
 
 recursedeps = [
-  # buildtools provides clang_format.
-  'buildtools',
   'third_party/googletest',
   'third_party/jsoncpp',
   'third_party/vulkan-deps',

scripts/roll_chromium_deps.py

@@ -33,6 +33,12 @@ def FindSrcDirPath():
 ANGLE_CHROMIUM_DEPS = [
     'build',
     'buildtools',
+    'buildtools/clang_format/script',
+    'buildtools/linux64',
+    'buildtools/mac',
+    'buildtools/third_party/libc++/trunk',
+    'buildtools/third_party/libc++abi/trunk',
+    'buildtools/win',
     'testing',
     'third_party/abseil-cpp',
     'third_party/catapult',