@@ -12,45 +12,51 @@ vars = {
12
12
'build_with_chromium' : False ,
13
13
14
14
'build_url' : 'https://chromium.googlesource.com/chromium/src/build.git' ,
15
- 'build_revision' : '253f9e7fd541bc035d81d794a8fe206b1a0720f6 ' ,
15
+ 'build_revision' : '7a8285c06acd753e6228263f48e5595e20ca1577 ' ,
16
16
17
17
'buildtools_url' : 'https://chromium.googlesource.com/chromium/src/buildtools.git' ,
18
- 'buildtools_revision' : '9491ff1efcb98797b3989a454c3bb721272689e5 ' ,
18
+ 'buildtools_revision' : '3ef44a2b92d5dd1faa5189a06f3a5febe6db2d58 ' ,
19
19
20
20
'depot_tools_url' : 'https://chromium.googlesource.com/chromium/tools/depot_tools.git' ,
21
- 'depot_tools_revision' : 'de6a9a9692db6667df3b7f972bcead57d6154e9f ' ,
21
+ 'depot_tools_revision' : 'cba7859885743d3c9865e4f1c076a6f2b698932d ' ,
22
22
23
23
'inspector_protocol_url' : 'https://chromium.googlesource.com/deps/inspector_protocol' ,
24
- 'inspector_protocol_revision' : '916f43c554c65ebf4ccd896b0f4e2ac99a67c434' ,
24
+ 'inspector_protocol_revision' : '2915acabcf62efd7257c57bb8a443a7c389c65cb' ,
25
+
26
+ # Keeping track of the last time we rollerd the browser protocol files.
27
+ 'chromium_browser_protocol_revision' : 'a51d9c64b04a596df7ca3a57a88d5427746fcda2' ,
25
28
26
29
'clang_format_url' : 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git' ,
27
- 'clang_format_revision' : 'e5337933f2951cacd3aeacd238ce4578163ca0b9 ' ,
30
+ 'clang_format_revision' : '3c0acd2d4e73dd911309d9e970ba09d58bf23a62 ' ,
28
31
29
32
'emscripten_tag' : 'ade9d780ff17c88d81aa13860361743e3c1e1396' ,
30
33
31
34
# GN CIPD package version.
32
- 'gn_version' : 'git_revision:88e8054aff7bd0cb2295c7d9361d2be0b7355f27 ' ,
35
+ 'gn_version' : 'git_revision:b2afae122eeb6ce09c52d63f67dc53fc517dbdc8 ' ,
33
36
34
- 'cmake_version' : 'version:3.16.1 ' ,
37
+ 'cmake_version' :
'version:[email protected] ' ,
35
38
36
39
'llvm_url' : 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/' ,
37
- 'llvm_revision' : 'c08d3b08f6d71e974537de226c68d4c94c396a46 ' ,
40
+ 'llvm_revision' : '3c51ea3619e488db19cd26840ed46d58cfc7062f ' ,
38
41
39
42
'lldb_eval_url' : 'https://chromium.googlesource.com/external/github.com/google/lldb-eval.git' ,
40
43
'lldb_eval_revision' : 'e87123a7e639bf1d86f24c37079570fb7fa00b72' ,
41
44
42
45
# ninja CIPD package version.
43
- # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools /ninja
44
- 'ninja_version' :
'version:[email protected] .6 ' ,
46
+ # https://chrome-infra-packages.appspot.com/p/infra/3pp/build_support /ninja-1_11_1/
47
+ 'ninja_version' :
'version:[email protected] .2 ' ,
45
48
46
49
# Chrome version used for tests. It should be regularly updated to
47
50
# match the Canary version listed here:
48
51
# https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json
49
- 'chrome' : '124 .0.6339 .0' ,
52
+ 'chrome' : '128 .0.6611 .0' ,
50
53
51
54
# 'magic' text to tell depot_tools that git submodules should be accepted but
52
55
# but parity with DEPS file is expected.
53
- 'SUBMODULE_MIGRATION' : 'True'
56
+ 'SUBMODULE_MIGRATION' : 'True' ,
57
+
58
+ # condition to allowlist deps for non-git-source processing.
59
+ 'non_git_source' : 'True' ,
54
60
}
55
61
56
62
# Only these hosts are allowed for dependencies in this DEPS file.
@@ -64,7 +70,7 @@ deps = {
64
70
},
65
71
'third_party/cmake' : {
66
72
'packages' : [{
67
- 'package' : 'infra/cmake/${{platform}}' ,
73
+ 'package' : 'infra/3pp/tools/ cmake/${{platform}}' ,
68
74
'version' : Var ('cmake_version' )
69
75
}],
70
76
'dep_type' :
@@ -108,7 +114,7 @@ deps = {
108
114
'buildtools/win' : {
109
115
'packages' : [
110
116
{
111
- 'package' : 'gn/gn/windows-${{arch}} ' ,
117
+ 'package' : 'gn/gn/windows-amd64 ' ,
112
118
'version' : Var ('gn_version' ),
113
119
}
114
120
],
@@ -123,6 +129,7 @@ deps = {
123
129
}
124
130
],
125
131
'dep_type' : 'cipd' ,
132
+ 'condition' : 'non_git_source' ,
126
133
},
127
134
128
135
'build' : {
@@ -140,7 +147,7 @@ deps = {
140
147
'third_party/ninja' : {
141
148
'packages' : [
142
149
{
143
- 'package' : 'infra/3pp/tools /ninja/${{platform}}' ,
150
+ 'package' : 'infra/3pp/build_support /ninja-1_11_1 /${{platform}}' ,
144
151
'version' : Var ('ninja_version' ),
145
152
}
146
153
],
@@ -216,58 +223,6 @@ hooks = [
216
223
],
217
224
},
218
225
219
- # Pull clang-format binaries using checked-in hashes.
220
- {
221
- 'name' : 'clang_format_win' ,
222
- 'pattern' : '.' ,
223
- 'condition' : 'host_os == "win" and build_with_chromium == False' ,
224
- 'action' : [ 'python3' ,
225
- 'third_party/depot_tools/download_from_google_storage.py' ,
226
- '--no_resume' ,
227
- '--no_auth' ,
228
- '--bucket' , 'chromium-clang-format' ,
229
- '-s' , 'buildtools/win/clang-format.exe.sha1' ,
230
- ],
231
- },
232
- {
233
- 'name' : 'clang_format_mac_x64' ,
234
- 'pattern' : '.' ,
235
- 'condition' : 'host_os == "mac" and build_with_chromium == False and host_cpu == "x64"' ,
236
- 'action' : [ 'python3' ,
237
- 'third_party/depot_tools/download_from_google_storage.py' ,
238
- '--no_resume' ,
239
- '--no_auth' ,
240
- '--bucket' , 'chromium-clang-format' ,
241
- '-s' , 'buildtools/mac/clang-format.x64.sha1' ,
242
- '-o' , 'buildtools/mac/clang-format' ,
243
- ],
244
- },
245
- {
246
- 'name' : 'clang_format_mac_arm64' ,
247
- 'pattern' : '.' ,
248
- 'condition' : 'host_os == "mac" and build_with_chromium == False and host_cpu == "arm64"' ,
249
- 'action' : [ 'python3' ,
250
- 'third_party/depot_tools/download_from_google_storage.py' ,
251
- '--no_resume' ,
252
- '--no_auth' ,
253
- '--bucket' , 'chromium-clang-format' ,
254
- '-s' , 'buildtools/mac/clang-format.arm64.sha1' ,
255
- '-o' , 'buildtools/mac/clang-format' ,
256
- ],
257
- },
258
- {
259
- 'name' : 'clang_format_linux' ,
260
- 'pattern' : '.' ,
261
- 'condition' : 'host_os == "linux" and build_with_chromium == False' ,
262
- 'action' : [ 'python3' ,
263
- 'third_party/depot_tools/download_from_google_storage.py' ,
264
- '--no_resume' ,
265
- '--no_auth' ,
266
- '--bucket' , 'chromium-clang-format' ,
267
- '-s' , 'buildtools/linux64/clang-format.sha1' ,
268
- ],
269
- },
270
-
271
226
# Pull Chrome binaries from CfT buckets.
272
227
{
273
228
'name' : 'download_chrome_win' ,
@@ -334,13 +289,6 @@ hooks = [
334
289
'action' : ['python3' , 'build/util/lastchange.py' ,
335
290
'-o' , 'build/util/LASTCHANGE' ],
336
291
},
337
- {
338
- 'name' : 'sysroot_x64' ,
339
- 'pattern' : '.' ,
340
- 'condition' : 'checkout_linux and checkout_x64 and build_with_chromium == False' ,
341
- 'action' : ['python3' , 'build/linux/sysroot_scripts/install-sysroot.py' ,
342
- '--arch=x64' ],
343
- },
344
292
{
345
293
'name' : 'emscripten' ,
346
294
'pattern' : '.' ,
@@ -354,3 +302,8 @@ hooks = [
354
302
'action' : ['python3' , 'third_party/node/node.py' , '--output' , 'scripts/deps/sync-vscode-settings.js' ]
355
303
},
356
304
]
305
+
306
+ recursedeps = [
307
+ 'build' ,
308
+ 'buildtools' ,
309
+ ]
0 commit comments