Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit c7e3d55

Browse files
authored
Manual roll dart to 470117150f34d712ee6d8c4558b3c656d973f656 (#56915)
Roll dart to 470117150f34d712ee6d8c4558b3c656d973f656 Changes since last roll ``` 470117150f3 Version 3.7.0-208.0.dev 10867627709 CHANGELOG: move AOT invocation bits to the end of the 3.7 section 83863711d3b Migrate NotImportedCompletionPass. e01bbdfd1f4 Deprecate completions from plugins api. 2a2905228fb Add extension on Completer to simplify code. 05696d50ccf Migrate postfix_completion.dart, statement_completion.dart. ed49d04e2e0 [analysis_server] Extract some shared code from editableArguments to be used by editArgument c54255fe9db [element model] migrate `prefer_asserts_in_initializer_lists` eaf3912b5d6 [deps] rev core, ecosystem, glob, http_multi_server, lints, markdown, package_config, pool, protobuf, pub_semver, shelf, source_maps, source_span, stack_trace, stream_channel, string_scanner, sync_http, term_glyph, test, test_descriptor, test_process, test_reflective_loader, tools, vector_math, watcher, web, web_socket_channel, webdriver, webkit_inspection_protocol, yaml, yaml_edit 11a11259724 Switch boringssl to the pre-generated GN source list. a635ccf2f57 [analysis_server] Only mark positional arguments as editable if they wouldn't require inserting additional values 619c8511aba [analysis_server] Add tests for formatter language version for legacy protocol a8f5e64a330 Roll Fuchsia Test Scripts from 6FgM4KTbxxmyYoiOs... to VilXq4eGH5A24wRWA... 623c574b817 [vm] Clean up few isolate fields. bfb507a3af9 Migrate utilities.dart 06caa3fa11e [DAS] Adds new import with show option 0197beaa8e0 [flow analysis] Remove _typeContains method. 56b6e5b9f60 Json codable no type assumption in custom fromJson e013a4c9bfa [analysis_server] Add some notes on how to use the CPU Profiler for the analysis server hosted by VS Code 0f723b3ef3c [vm] Fix build on gcc 14.2.0. ``` This is manual roll because dart_boringssl_gen_rev is no longer present in dart sdk DEPS has to be removed from flutter engine DEPS manually.
1 parent 29d6640 commit c7e3d55

File tree

6 files changed

+123
-41
lines changed

6 files changed

+123
-41
lines changed

DEPS

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,26 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': '61bfa9bbb91d50754f6b6a2bef5629c9fd074e6f',
59+
'dart_revision': '470117150f34d712ee6d8c4558b3c656d973f656',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6363
'dart_binaryen_rev': '93883fde36ac158fd415dcd6dbd387dcfd928d3c',
64-
'dart_boringssl_gen_rev': 'b67a5fe651e1618baa311e452e3c188d96db2021',
6564
'dart_boringssl_rev': 'cd95210465496ac2337b313cf49f607762abe286',
66-
'dart_core_rev': '1de837279d3c4ce21fef2a5af8a7f0b668ef3d85',
65+
'dart_core_rev': 'abcf992cf9fe1e896ed9dcff15523c0a6c00621d',
6766
'dart_devtools_rev': '3e5327a02693b1405359dc5322d7f0a40151b9b7',
6867
'dart_http_rev': '79470d014b467f01b0e7c5b63ab6c86b22dec8db',
6968
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
7069
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7170
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
72-
'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
71+
'dart_protobuf_rev': 'da7279c56734cffed4deb1e3a6f93bdcefccf6b8',
7372
'dart_pub_rev': '30bfc439fedba1ee3daadcf542f1483479bc4909',
74-
'dart_tools_rev': '466bb19b8ad8b278c351914ce20bedb7b32bfc91',
75-
'dart_watcher_rev': '7a15a903f7ce0737cce7d08ff30402d41b9f7b62',
76-
'dart_web_rev': '8d243766b45c163a9d18a89de059eba24398d163',
73+
'dart_tools_rev': '1c5b8b949128d62182e162ef65a2e6f3feb19acf',
74+
'dart_watcher_rev': 'bc44e6f6b85972e516c44b9ae6c042b4cbd7c72b',
75+
'dart_web_rev': 'bdf112ec64d28285cc29c6c78274ff3a827bb79b',
7776
'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c',
78-
'dart_webkit_inspection_protocol_rev': 'a834c3b700ead5f1157740d6585ab374f8af1507',
79-
'dart_yaml_edit_rev': '8bd0fdfbe1e5119367500543d68be10691efce58',
77+
'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32',
78+
'dart_yaml_edit_rev': 'fbdc70acc164af187772e013a2e1364cd05b88dc',
8079

8180
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
8281

@@ -151,7 +150,6 @@ vars = {
151150
"upstream_angle": "https://github.com/google/angle.git",
152151
"upstream_archive": "https://github.com/brendan-duncan/archive.git",
153152
"upstream_benchmark": "https://github.com/google/benchmark.git",
154-
"upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git",
155153
"upstream_boringssl": "https://github.com/openssl/openssl.git",
156154
"upstream_brotli": "https://github.com/google/brotli.git",
157155
"upstream_buildroot": "https://github.com/flutter/buildroot.git",
@@ -296,9 +294,6 @@ deps = {
296294
'src/flutter/third_party/googletest':
297295
Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
298296

299-
'src/flutter/third_party/boringssl':
300-
Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
301-
302297
'src/flutter/third_party/brotli':
303298
Var('skia_git') + '/external/github.com/google/brotli.git' + '@' + '350100a5bb9d9671aca85213b2ec7a70a361b0cd',
304299

@@ -340,13 +335,13 @@ deps = {
340335
Var('dart_git') + '/dartdoc.git@c7f11603effa88ddacabfd555993f322fca8b3fe',
341336

342337
'src/flutter/third_party/dart/third_party/pkg/glob':
343-
Var('dart_git') + '/glob.git@b6319d6c2880b44039e75dfed80f7ce150f76d51',
338+
Var('dart_git') + '/glob.git@994191a107b99a1911a3ef52ca238cd9305c8d37',
344339

345340
'src/flutter/third_party/dart/third_party/pkg/http':
346341
Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'),
347342

348343
'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
349-
Var('dart_git') + '/http_multi_server.git@c8aabe36268aa38c906eae46728c10d883b9aced',
344+
Var('dart_git') + '/http_multi_server.git@f6a748819139b8cbf513d5fc36b10676b0cb066f',
350345

351346
'src/flutter/third_party/dart/third_party/pkg/intl':
352347
Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
@@ -355,16 +350,16 @@ deps = {
355350
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
356351

357352
'src/flutter/third_party/dart/third_party/pkg/markdown':
358-
Var('dart_git') + '/markdown.git@776689c8749ebddd4ea0ec899085bd2aae0e25ba',
353+
Var('dart_git') + '/markdown.git@4d5dbc659955973902f2585c54e94d453532db70',
359354

360355
'src/flutter/third_party/dart/third_party/pkg/native':
361356
Var('dart_git') + '/native.git@028f89d4a59448f9ecda5bd3d4519e2d7c742072',
362357

363358
'src/flutter/third_party/dart/third_party/pkg/package_config':
364-
Var('dart_git') + '/package_config.git@2583a4e2f9382409ba3bcfa4887ef2a2a8a2aee3',
359+
Var('dart_git') + '/package_config.git@76f2f6c245451da1fa24d7bbb00251b909e729a5',
365360

366361
'src/flutter/third_party/dart/third_party/pkg/pool':
367-
Var('dart_git') + '/pool.git@0bac9b20ef61ad8bfdd6b92b565dd12e8e2e2c78',
362+
Var('dart_git') + '/pool.git@f85209d83cb0aa3c5612ed80de32df51ba580abd',
368363

369364
'src/flutter/third_party/dart/third_party/pkg/protobuf':
370365
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -373,40 +368,40 @@ deps = {
373368
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
374369

375370
'src/flutter/third_party/dart/third_party/pkg/pub_semver':
376-
Var('dart_git') + '/pub_semver.git@ab3eab50cc9f3df650ba7f5571aa2a1ea715dcc8',
371+
Var('dart_git') + '/pub_semver.git@8e9fcb9d3f89f06022387f906da4d380688f935c',
377372

378373
'src/flutter/third_party/dart/third_party/pkg/shelf':
379-
Var('dart_git') + '/shelf.git@a2708cd8bce88d5e6391b1cb5bbe80b5a072c55a',
374+
Var('dart_git') + '/shelf.git@657ebd359c528a8655b8f6b96ae19254686cd91c',
380375

381376
'src/flutter/third_party/dart/third_party/pkg/source_maps':
382-
Var('dart_git') + '/source_maps.git@b20b97003a48d78a1ecba7e46d932ea4b480dd94',
377+
Var('dart_git') + '/source_maps.git@198d32bbde2f5736c04dfbab306a17096fd1648b',
383378

384379
'src/flutter/third_party/dart/third_party/pkg/source_span':
385-
Var('dart_git') + '/source_span.git@f147469ba02108c1ade3680de548b7b447de8c72',
380+
Var('dart_git') + '/source_span.git@22a243eb50d926935a8a1300a49af6d2988c3ae6',
386381

387382
'src/flutter/third_party/dart/third_party/pkg/sse':
388383
Var('dart_git') + '/sse.git@befbd6d35118f59525903242db3888942ac34180',
389384

390385
'src/flutter/third_party/dart/third_party/pkg/stack_trace':
391-
Var('dart_git') + '/stack_trace.git@63e79f584567f7c73e7f5739c7cfd8e748f51f16',
386+
Var('dart_git') + '/stack_trace.git@b660cfa444d46bcceb3a0eacbd6a2a7829da11de',
392387

393388
'src/flutter/third_party/dart/third_party/pkg/stream_channel':
394-
Var('dart_git') + '/stream_channel.git@9bfc2a8dec202bcd07332f39df0f905c670092c6',
389+
Var('dart_git') + '/stream_channel.git@71fe6dd315e7f451466da80f7af2661cd28aaaea',
395390

396391
'src/flutter/third_party/dart/third_party/pkg/string_scanner':
397-
Var('dart_git') + '/string_scanner.git@255d67111e3ed67caedba2789269b6344bf62638',
392+
Var('dart_git') + '/string_scanner.git@77de235c061a09264cae920e52939787325c8cae',
398393

399394
'src/flutter/third_party/dart/third_party/pkg/tar':
400395
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
401396

402397
'src/flutter/third_party/dart/third_party/pkg/term_glyph':
403-
Var('dart_git') + '/term_glyph.git@31abb04b735395ba98db3dd4a360b85729dfddfa',
398+
Var('dart_git') + '/term_glyph.git@9ed8ed96fdd84cb7b72ee1be3e86010969fa95d4',
404399

405400
'src/flutter/third_party/dart/third_party/pkg/test':
406-
Var('dart_git') + '/test.git@8a07bee398833ca38ca4c88905ccdbd513f40705',
401+
Var('dart_git') + '/test.git@c2a69865be0399e7615da45452d14afe8b6f6a90',
407402

408403
'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
409-
Var('dart_git') + '/test_reflective_loader.git@30a552df6421e1f68cdc33c98c2512984b6f42b9',
404+
Var('dart_git') + '/test_reflective_loader.git@faade6299d1823f0d062eb5e98f3b440ddcea7c6',
410405

411406
'src/flutter/third_party/dart/third_party/pkg/tools':
412407
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -418,7 +413,7 @@ deps = {
418413
Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
419414

420415
'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
421-
Var('dart_git') + '/web_socket_channel.git@abe77eabb6566a2d5129d1178ef2e342ca578e64',
416+
Var('dart_git') + '/web_socket_channel.git@7a2039fd7c4c656ab27850926f89103b5f188dab',
422417

423418
'src/flutter/third_party/dart/third_party/pkg/webdev':
424419
Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -427,7 +422,7 @@ deps = {
427422
Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
428423

429424
'src/flutter/third_party/dart/third_party/pkg/yaml':
430-
Var('dart_git') + '/yaml.git@402655e84389bd1a4208000d75c16d1e5faeb443',
425+
Var('dart_git') + '/yaml.git@2a3727288a9336b6f9b7c5236657414ce1ee5d8a',
431426

432427
'src/flutter/third_party/dart/third_party/pkg/yaml_edit':
433428
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),

ci/licenses_golden/excluded_files

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -946,11 +946,6 @@
946946
../../../flutter/third_party/angle/tools
947947
../../../flutter/third_party/angle/util
948948
../../../flutter/third_party/benchmark
949-
../../../flutter/third_party/boringssl/.git
950-
../../../flutter/third_party/boringssl/.gitignore
951-
../../../flutter/third_party/boringssl/OWNERS
952-
../../../flutter/third_party/boringssl/README
953-
../../../flutter/third_party/boringssl/codereview.settings
954949
../../../flutter/third_party/boringssl/src/.bazelrc
955950
../../../flutter/third_party/boringssl/src/.bcr/README.md
956951
../../../flutter/third_party/boringssl/src/.clang-format
@@ -1666,6 +1661,7 @@
16661661
../../../flutter/third_party/dart/third_party/OWNERS
16671662
../../../flutter/third_party/dart/third_party/binary_size
16681663
../../../flutter/third_party/dart/third_party/binaryen
1664+
../../../flutter/third_party/dart/third_party/boringssl/OWNERS
16691665
../../../flutter/third_party/dart/third_party/clang.tar.gz.sha1
16701666
../../../flutter/third_party/dart/third_party/cpu_features/OWNERS
16711667
../../../flutter/third_party/dart/third_party/cpu_features/README.chromium

ci/licenses_golden/licenses_dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: dd6f376925bfd278af7e925fcc63523f
1+
Signature: 056116a9fe82097da9811ba9dcdf9939
22

33
====================================================================================================
44
LIBRARY: dart
@@ -4807,7 +4807,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
48074807
This Source Code Form is "Incompatible With Secondary Licenses", as
48084808
defined by the Mozilla Public License, v. 2.0.
48094809

4810-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/61bfa9bbb91d50754f6b6a2bef5629c9fd074e6f
4810+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/470117150f34d712ee6d8c4558b3c656d973f656
48114811
/third_party/fallback_root_certificates/
48124812

48134813
====================================================================================================

third_party/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Ignore everything by default, as these come from gclient/DEPS.
22
# We'll explicitly include the folders we want to track.
33
/*
4+
/boringssl/src
45

56
# Include the .gitignore file itself and .clang-tidy.
67
!.gitignore
@@ -12,6 +13,7 @@
1213

1314
# Include folders that have hand-written code (not DEPS).
1415
!accessibility/
16+
!boringssl/
1517
!canvaskit/
1618
!spring_animation/
1719
!test_shaders/

third_party/boringssl/BUILD.gn

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# Copyright 2014 The Chromium Authors
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
import("//build/config/android/config.gni")
6+
import("//build/config/arm.gni")
7+
import("//build/config/compiler/compiler.gni")
8+
import("//build/config/sanitizers/sanitizers.gni")
9+
import("//build_overrides/build.gni")
10+
import("src/gen/sources.gni")
11+
12+
# Config for us and everybody else depending on BoringSSL.
13+
config("external_config") {
14+
include_dirs = [ "src/include" ]
15+
if (is_component_build) {
16+
defines = [ "BORINGSSL_SHARED_LIBRARY" ]
17+
}
18+
}
19+
20+
# The config used by the :boringssl component itself, and the fuzzer copies.
21+
config("component_config") {
22+
visibility = [ ":*" ]
23+
configs = [ ":internal_config" ]
24+
defines = [ "BORINGSSL_IMPLEMENTATION" ]
25+
26+
cflags_c = [ "-std=c17" ]
27+
}
28+
29+
# This config is used by anything that consumes internal headers. Tests consume
30+
# this rather than :component_config.
31+
config("internal_config") {
32+
visibility = [ ":*" ]
33+
defines = [
34+
"OPENSSL_SMALL",
35+
"OPENSSL_STATIC_ARMCAP",
36+
]
37+
if (is_posix) {
38+
defines += [ "_XOPEN_SOURCE=700" ]
39+
}
40+
}
41+
42+
config("no_asm_config") {
43+
visibility = [ ":*" ]
44+
defines = [ "OPENSSL_NO_ASM" ]
45+
}
46+
47+
# TODO(crbug.com/42290535): Move Chromium's use of libpki to the public API and
48+
# unexport pki_internal_headers.
49+
all_sources = bcm_internal_headers + bcm_sources + crypto_internal_headers +
50+
crypto_sources + ssl_internal_headers + ssl_sources + pki_sources
51+
all_headers = crypto_headers + ssl_headers + pki_headers + pki_internal_headers
52+
53+
if (is_msan) {
54+
# MSan instrumentation is incompatible with assembly optimizations.
55+
# BoringSSL's GAS-compatible assembly knows how to detect MSan, but the NASM
56+
# assembly does not, so we check for MSan explicitly.
57+
source_set("boringssl_asm") {
58+
visibility = [ ":*" ]
59+
public_configs = [ ":no_asm_config" ]
60+
}
61+
} else if (is_win && (current_cpu == "x86" || current_cpu == "x64")) {
62+
# Windows' x86 and x86_64 assembly is built with NASM.
63+
source_set("boringssl_asm") {
64+
visibility = [ ":*" ]
65+
public_configs = [ ":no_asm_config" ]
66+
}
67+
} else {
68+
# All other targets use GAS-compatible assembler. BoringSSL's assembly files
69+
# are all wrapped in processor checks for the corresponding target, so there
70+
# is no need to add target conditions in the build.
71+
source_set("boringssl_asm") {
72+
visibility = [ ":*" ]
73+
sources = rebase_path(bcm_sources_asm + crypto_sources_asm, ".", "src")
74+
include_dirs = [ "src/include" ]
75+
}
76+
}
77+
78+
source_set("boringssl") {
79+
sources = rebase_path(all_sources, ".", "src")
80+
public = rebase_path(all_headers, ".", "src")
81+
82+
if (is_win) {
83+
configs += [ ":no_asm_config" ]
84+
} else {
85+
deps = [ ":boringssl_asm" ]
86+
}
87+
88+
public_configs = [ ":external_config" ]
89+
configs += [ ":component_config" ]
90+
91+
configs -= [ "//build/config/compiler:chromium_code" ]
92+
configs += [ "//build/config/compiler:no_chromium_code" ]
93+
}

tools/gn

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -569,10 +569,6 @@ def to_gn_args(args):
569569
else:
570570
gn_args['enable_backtrace'] = False
571571

572-
# Overrides whether Boring SSL is compiled with system as. Only meaningful
573-
# on Android.
574-
gn_args['bssl_use_clang_integrated_as'] = True
575-
576572
if args.allow_deprecated_api_calls:
577573
gn_args['allow_deprecated_api_calls'] = args.allow_deprecated_api_calls
578574

0 commit comments

Comments
 (0)