Skip to content

Commit 6c71a23

Browse files
committed
Larger update on devtools codebase
This makes the codebase totally up to speed on all sub-directories. original HEAD hash: 24fee483df118f1fb7f1ba7c62f6f7452d206ba5 Signed-off-by: Vinicius Dallacqua <[email protected]>
1 parent 33a9e0e commit 6c71a23

File tree

918 files changed

+48030
-16613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

918 files changed

+48030
-16613
lines changed

BUILD.gn

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import("./config/gni/devtools_grd_files.gni")
66
import("./config/gni/devtools_image_files.gni")
77
import("./front_end/emulated_devices/optimized/optimized_images.gni")
8+
import("./scripts/build/ninja/copy.gni")
89
import("./scripts/build/ninja/node.gni")
910
import("./scripts/build/ninja/vars.gni")
1011
import("./third_party/blink/public/public_features.gni")
@@ -13,6 +14,7 @@ import("./third_party/typescript/typescript.gni")
1314
#-------------------------------------------------------------------------------
1415

1516
devtools_frontend_resources_deps = [
17+
":favicon",
1618
"front_end",
1719
"test",
1820
]
@@ -199,3 +201,7 @@ ts_library("frontend_indexer_tsconfig") {
199201
sourceslist = "$root_build_dir/indexer_ts_files.txt"
200202
public_deps = [ ":indexer_ts_files" ]
201203
}
204+
205+
copy_to_gen("favicon") {
206+
sources = [ "favicon.ico" ]
207+
}

DEPS

Lines changed: 71 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,27 @@ vars = {
1212
'build_with_chromium': False,
1313

1414
'build_url': 'https://chromium.googlesource.com/chromium/src/build.git',
15-
'build_revision': '56e49c7c6f63a51be29b9b9126fc106b16659a5b',
15+
'build_revision': '6cfaa2aae283169640a0a2923a402b2c9cad832a',
1616

1717
'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
18-
'buildtools_revision': 'e73bcd11d10df067da2068d4aab16d95aa65e990',
18+
'buildtools_revision': '1e192ffd2cbfbbb3081a6dbb609f398a3bb588b1',
1919

2020
'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
21-
'depot_tools_revision': '1387a8c9586c457bbfda4ba2a81f41efd345abd8',
21+
'depot_tools_revision': '1e6454f8d296bba439da34f7936cd7adb7e579b7',
2222

2323
'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
2424
'inspector_protocol_revision': '2915acabcf62efd7257c57bb8a443a7c389c65cb',
2525

26+
# Keeping track of the last time we rollerd the browser protocol files.
27+
'chromium_browser_protocol_revision' : '8f0bb6d5f5988be0f9183c035e37afcbcffa45a2',
28+
2629
'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git',
2730
'clang_format_revision': '3c0acd2d4e73dd911309d9e970ba09d58bf23a62',
2831

2932
'emscripten_tag': 'ade9d780ff17c88d81aa13860361743e3c1e1396',
3033

3134
# GN CIPD package version.
32-
'gn_version': 'git_revision:b2afae122eeb6ce09c52d63f67dc53fc517dbdc8',
35+
'gn_version': 'git_revision:93550dc1701d16c4c1c6c78408e61f09485f3dd0',
3336

3437
'cmake_version': 'version:[email protected]',
3538

@@ -40,13 +43,13 @@ vars = {
4043
'lldb_eval_revision': 'e87123a7e639bf1d86f24c37079570fb7fa00b72',
4144

4245
# ninja CIPD package version.
43-
# https://chrome-infra-packages.appspot.com/p/infra/3pp/build_support/ninja-1_11_1/
44-
'ninja_version': 'version:2@1.11.1.chromium.2',
46+
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
47+
'ninja_version': 'version:2@1.12.1.chromium.4',
4548

4649
# Chrome version used for tests. It should be regularly updated to
4750
# match the Canary version listed here:
4851
# https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json
49-
'chrome': '128.0.6583.0',
52+
'chrome': '129.0.6654.0',
5053

5154
# 'magic' text to tell depot_tools that git submodules should be accepted but
5255
# but parity with DEPS file is expected.
@@ -58,7 +61,13 @@ vars = {
5861

5962
# Only these hosts are allowed for dependencies in this DEPS file.
6063
# If you need to add a new host, contact chrome infrastracture team.
61-
allowed_hosts = [ 'chromium.googlesource.com', 'chrome-infra-packages.appspot.com' ]
64+
allowed_hosts = [
65+
'chromium.googlesource.com',
66+
'chrome-infra-packages.appspot.com',
67+
68+
# TODO(b/337061377): Move into a separate alllowed gcs bucket list.
69+
'chromium-nodejs',
70+
]
6271

6372
deps = {
6473
'third_party/clang-format/script': {
@@ -144,69 +153,73 @@ deps = {
144153
'third_party/ninja': {
145154
'packages': [
146155
{
147-
'package': 'infra/3pp/build_support/ninja-1_11_1/${{platform}}',
156+
'package': 'infra/3pp/tools/ninja/${{platform}}',
148157
'version': Var('ninja_version'),
149158
}
150159
],
151160
'dep_type': 'cipd',
152161
'condition': 'build_with_chromium == False',
153162
},
154-
}
155-
156-
hooks = [
157163
# Pull down Node binaries for WebUI toolchain.
158-
{
159-
'name': 'node_linux64',
160-
'pattern': '.',
161-
'condition': 'host_os == "linux" and build_with_chromium == False',
162-
'action': [ 'python3',
163-
'third_party/depot_tools/download_from_google_storage.py',
164-
'--no_resume',
165-
'--extract',
166-
'--no_auth',
167-
'--bucket', 'chromium-nodejs/20.11.0',
168-
'-s', 'third_party/node/linux/node-linux-x64.tar.gz.sha1',
164+
'third_party/node/linux': {
165+
'dep_type': 'gcs',
166+
'condition': 'host_os == "linux" and build_with_chromium == False and non_git_source',
167+
'bucket': 'chromium-nodejs',
168+
'objects': [
169+
{
170+
'object_name': '20.11.0/f9a337cfa0e2b92d3e5c671c26b454bd8e99769e',
171+
'sha256sum': '0ba9cc91698c1f833a1fdc1fe0cb392d825ad484c71b0d84388ac80bfd3d6079',
172+
'size_bytes': 43716484,
173+
'generation': 1711567575687220,
174+
'output_file': 'node-linux-x64.tar.gz',
175+
},
169176
],
170177
},
171-
{
172-
'name': 'node_mac',
173-
'pattern': '.',
174-
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu != "arm64"',
175-
'action': [ 'python3',
176-
'third_party/depot_tools/download_from_google_storage.py',
177-
'--no_resume',
178-
'--extract',
179-
'--no_auth',
180-
'--bucket', 'chromium-nodejs/20.11.0',
181-
'-s', 'third_party/node/mac/node-darwin-x64.tar.gz.sha1',
182-
],
178+
'third_party/node/mac': {
179+
'dep_type': 'gcs',
180+
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu != "arm64" and non_git_source',
181+
'bucket': 'chromium-nodejs',
182+
'objects': [
183+
{
184+
'object_name': '20.11.0/e3c0fd53caae857309815f3f8de7c2dce49d7bca',
185+
'sha256sum': '20affacca2480c368b75a1d91ec1a2720604b325207ef0cf39cfef3c235dad19',
186+
'size_bytes': 40649378,
187+
'generation': 1711567481181885,
188+
'output_file': 'node-darwin-x64.tar.gz',
189+
},
190+
],
183191
},
184-
{
185-
'name': 'node_mac',
186-
'pattern': '.',
187-
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu == "arm64"',
188-
'action': [ 'python3',
189-
'third_party/depot_tools/download_from_google_storage.py',
190-
'--no_resume',
191-
'--extract',
192-
'--no_auth',
193-
'--bucket', 'chromium-nodejs/20.11.0',
194-
'-s', 'third_party/node/mac/node-darwin-arm64.tar.gz.sha1',
195-
],
192+
'third_party/node/mac_arm64': {
193+
'dep_type': 'gcs',
194+
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu == "arm64" and non_git_source',
195+
'bucket': 'chromium-nodejs',
196+
'objects': [
197+
{
198+
'object_name': '20.11.0/5b5681e12a21cda986410f69e03e6220a21dd4d2',
199+
'sha256sum': 'cecb99fbb369a9090dddc27e228b66335cd72555b44fa8839ef78e56c51682c5',
200+
'size_bytes': 38989321,
201+
'generation': 1711567557161126,
202+
'output_file': 'node-darwin-arm64.tar.gz',
203+
},
204+
],
196205
},
197-
{
198-
'name': 'node_win',
199-
'pattern': '.',
200-
'condition': 'host_os == "win" and build_with_chromium == False',
201-
'action': [ 'python3',
202-
'third_party/depot_tools/download_from_google_storage.py',
203-
'--no_resume',
204-
'--no_auth',
205-
'--bucket', 'chromium-nodejs/20.11.0',
206-
'-s', 'third_party/node/win/node.exe.sha1',
207-
],
206+
'third_party/node/win': {
207+
'dep_type': 'gcs',
208+
'condition': 'host_os == "win" and build_with_chromium == False and non_git_source',
209+
'bucket': 'chromium-nodejs',
210+
'objects': [
211+
{
212+
'object_name': '20.11.0/2cb36010af52bc5e2a2d1e3675c10361c80d8f8d',
213+
'sha256sum': '5da5e201155bb3ea99134b404180adebcfa696b0dbc09571d01a09ca5489f53e',
214+
'size_bytes': 70017688,
215+
'generation': 1705443750949255,
216+
'output_file': 'node.exe',
217+
},
218+
],
208219
},
220+
}
209221

222+
hooks = [
210223
{
211224
# Ensure that the DEPS'd "depot_tools" has its self-update capability
212225
# disabled.

0 commit comments

Comments
 (0)