diff --git a/DEPS b/DEPS index 6840bb8a45..02013faa86 100644 --- a/DEPS +++ b/DEPS @@ -56,27 +56,26 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '61bfa9bbb91d50754f6b6a2bef5629c9fd074e6f', + 'dart_revision': '470117150f34d712ee6d8c4558b3c656d973f656', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py 'dart_binaryen_rev': '93883fde36ac158fd415dcd6dbd387dcfd928d3c', - 'dart_boringssl_gen_rev': 'b67a5fe651e1618baa311e452e3c188d96db2021', 'dart_boringssl_rev': 'cd95210465496ac2337b313cf49f607762abe286', - 'dart_core_rev': '1de837279d3c4ce21fef2a5af8a7f0b668ef3d85', + 'dart_core_rev': 'abcf992cf9fe1e896ed9dcff15523c0a6c00621d', 'dart_devtools_rev': '3e5327a02693b1405359dc5322d7f0a40151b9b7', 'dart_http_rev': '79470d014b467f01b0e7c5b63ab6c86b22dec8db', 'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb', 'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b', 'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10', - 'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e', + 'dart_protobuf_rev': 'da7279c56734cffed4deb1e3a6f93bdcefccf6b8', 'dart_pub_rev': '30bfc439fedba1ee3daadcf542f1483479bc4909', - 'dart_tools_rev': '466bb19b8ad8b278c351914ce20bedb7b32bfc91', - 'dart_watcher_rev': '7a15a903f7ce0737cce7d08ff30402d41b9f7b62', - 'dart_web_rev': '8d243766b45c163a9d18a89de059eba24398d163', + 'dart_tools_rev': '1c5b8b949128d62182e162ef65a2e6f3feb19acf', + 'dart_watcher_rev': 'bc44e6f6b85972e516c44b9ae6c042b4cbd7c72b', + 'dart_web_rev': 'bdf112ec64d28285cc29c6c78274ff3a827bb79b', 'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c', - 'dart_webkit_inspection_protocol_rev': 'a834c3b700ead5f1157740d6585ab374f8af1507', - 'dart_yaml_edit_rev': '8bd0fdfbe1e5119367500543d68be10691efce58', + 'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32', + 'dart_yaml_edit_rev': 'fbdc70acc164af187772e013a2e1364cd05b88dc', 'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1 @@ -151,7 +150,6 @@ vars = { "upstream_angle": "https://github.com/google/angle.git", "upstream_archive": "https://github.com/brendan-duncan/archive.git", "upstream_benchmark": "https://github.com/google/benchmark.git", - "upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git", "upstream_boringssl": "https://github.com/openssl/openssl.git", "upstream_brotli": "https://github.com/google/brotli.git", "upstream_buildroot": "https://github.com/flutter/buildroot.git", @@ -296,9 +294,6 @@ deps = { 'src/flutter/third_party/googletest': Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0', - 'src/flutter/third_party/boringssl': - Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'), - 'src/flutter/third_party/brotli': Var('skia_git') + '/external/github.com/google/brotli.git' + '@' + '350100a5bb9d9671aca85213b2ec7a70a361b0cd', @@ -340,13 +335,13 @@ deps = { Var('dart_git') + '/dartdoc.git@c7f11603effa88ddacabfd555993f322fca8b3fe', 'src/flutter/third_party/dart/third_party/pkg/glob': - Var('dart_git') + '/glob.git@b6319d6c2880b44039e75dfed80f7ce150f76d51', + Var('dart_git') + '/glob.git@994191a107b99a1911a3ef52ca238cd9305c8d37', 'src/flutter/third_party/dart/third_party/pkg/http': Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'), 'src/flutter/third_party/dart/third_party/pkg/http_multi_server': - Var('dart_git') + '/http_multi_server.git@c8aabe36268aa38c906eae46728c10d883b9aced', + Var('dart_git') + '/http_multi_server.git@f6a748819139b8cbf513d5fc36b10676b0cb066f', 'src/flutter/third_party/dart/third_party/pkg/intl': Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f', @@ -355,16 +350,16 @@ deps = { Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c', 'src/flutter/third_party/dart/third_party/pkg/markdown': - Var('dart_git') + '/markdown.git@776689c8749ebddd4ea0ec899085bd2aae0e25ba', + Var('dart_git') + '/markdown.git@4d5dbc659955973902f2585c54e94d453532db70', 'src/flutter/third_party/dart/third_party/pkg/native': Var('dart_git') + '/native.git@028f89d4a59448f9ecda5bd3d4519e2d7c742072', 'src/flutter/third_party/dart/third_party/pkg/package_config': - Var('dart_git') + '/package_config.git@2583a4e2f9382409ba3bcfa4887ef2a2a8a2aee3', + Var('dart_git') + '/package_config.git@76f2f6c245451da1fa24d7bbb00251b909e729a5', 'src/flutter/third_party/dart/third_party/pkg/pool': - Var('dart_git') + '/pool.git@0bac9b20ef61ad8bfdd6b92b565dd12e8e2e2c78', + Var('dart_git') + '/pool.git@f85209d83cb0aa3c5612ed80de32df51ba580abd', 'src/flutter/third_party/dart/third_party/pkg/protobuf': Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'), @@ -373,40 +368,40 @@ deps = { Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'), 'src/flutter/third_party/dart/third_party/pkg/pub_semver': - Var('dart_git') + '/pub_semver.git@ab3eab50cc9f3df650ba7f5571aa2a1ea715dcc8', + Var('dart_git') + '/pub_semver.git@8e9fcb9d3f89f06022387f906da4d380688f935c', 'src/flutter/third_party/dart/third_party/pkg/shelf': - Var('dart_git') + '/shelf.git@a2708cd8bce88d5e6391b1cb5bbe80b5a072c55a', + Var('dart_git') + '/shelf.git@657ebd359c528a8655b8f6b96ae19254686cd91c', 'src/flutter/third_party/dart/third_party/pkg/source_maps': - Var('dart_git') + '/source_maps.git@b20b97003a48d78a1ecba7e46d932ea4b480dd94', + Var('dart_git') + '/source_maps.git@198d32bbde2f5736c04dfbab306a17096fd1648b', 'src/flutter/third_party/dart/third_party/pkg/source_span': - Var('dart_git') + '/source_span.git@f147469ba02108c1ade3680de548b7b447de8c72', + Var('dart_git') + '/source_span.git@22a243eb50d926935a8a1300a49af6d2988c3ae6', 'src/flutter/third_party/dart/third_party/pkg/sse': Var('dart_git') + '/sse.git@befbd6d35118f59525903242db3888942ac34180', 'src/flutter/third_party/dart/third_party/pkg/stack_trace': - Var('dart_git') + '/stack_trace.git@63e79f584567f7c73e7f5739c7cfd8e748f51f16', + Var('dart_git') + '/stack_trace.git@b660cfa444d46bcceb3a0eacbd6a2a7829da11de', 'src/flutter/third_party/dart/third_party/pkg/stream_channel': - Var('dart_git') + '/stream_channel.git@9bfc2a8dec202bcd07332f39df0f905c670092c6', + Var('dart_git') + '/stream_channel.git@71fe6dd315e7f451466da80f7af2661cd28aaaea', 'src/flutter/third_party/dart/third_party/pkg/string_scanner': - Var('dart_git') + '/string_scanner.git@255d67111e3ed67caedba2789269b6344bf62638', + Var('dart_git') + '/string_scanner.git@77de235c061a09264cae920e52939787325c8cae', 'src/flutter/third_party/dart/third_party/pkg/tar': Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a', 'src/flutter/third_party/dart/third_party/pkg/term_glyph': - Var('dart_git') + '/term_glyph.git@31abb04b735395ba98db3dd4a360b85729dfddfa', + Var('dart_git') + '/term_glyph.git@9ed8ed96fdd84cb7b72ee1be3e86010969fa95d4', 'src/flutter/third_party/dart/third_party/pkg/test': - Var('dart_git') + '/test.git@8a07bee398833ca38ca4c88905ccdbd513f40705', + Var('dart_git') + '/test.git@c2a69865be0399e7615da45452d14afe8b6f6a90', 'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader': - Var('dart_git') + '/test_reflective_loader.git@30a552df6421e1f68cdc33c98c2512984b6f42b9', + Var('dart_git') + '/test_reflective_loader.git@faade6299d1823f0d062eb5e98f3b440ddcea7c6', 'src/flutter/third_party/dart/third_party/pkg/tools': Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'), @@ -418,7 +413,7 @@ deps = { Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'), 'src/flutter/third_party/dart/third_party/pkg/web_socket_channel': - Var('dart_git') + '/web_socket_channel.git@abe77eabb6566a2d5129d1178ef2e342ca578e64', + Var('dart_git') + '/web_socket_channel.git@7a2039fd7c4c656ab27850926f89103b5f188dab', 'src/flutter/third_party/dart/third_party/pkg/webdev': Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'), @@ -427,7 +422,7 @@ deps = { Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'), 'src/flutter/third_party/dart/third_party/pkg/yaml': - Var('dart_git') + '/yaml.git@402655e84389bd1a4208000d75c16d1e5faeb443', + Var('dart_git') + '/yaml.git@2a3727288a9336b6f9b7c5236657414ce1ee5d8a', 'src/flutter/third_party/dart/third_party/pkg/yaml_edit': Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'), diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index 4359844027..d6fa28a61d 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -946,11 +946,6 @@ ../../../flutter/third_party/angle/tools ../../../flutter/third_party/angle/util ../../../flutter/third_party/benchmark -../../../flutter/third_party/boringssl/.git -../../../flutter/third_party/boringssl/.gitignore -../../../flutter/third_party/boringssl/OWNERS -../../../flutter/third_party/boringssl/README -../../../flutter/third_party/boringssl/codereview.settings ../../../flutter/third_party/boringssl/src/.bazelrc ../../../flutter/third_party/boringssl/src/.bcr/README.md ../../../flutter/third_party/boringssl/src/.clang-format @@ -1666,6 +1661,7 @@ ../../../flutter/third_party/dart/third_party/OWNERS ../../../flutter/third_party/dart/third_party/binary_size ../../../flutter/third_party/dart/third_party/binaryen +../../../flutter/third_party/dart/third_party/boringssl/OWNERS ../../../flutter/third_party/dart/third_party/clang.tar.gz.sha1 ../../../flutter/third_party/dart/third_party/cpu_features/OWNERS ../../../flutter/third_party/dart/third_party/cpu_features/README.chromium diff --git a/engine/src/flutter/ci/licenses_golden/licenses_dart b/engine/src/flutter/ci/licenses_golden/licenses_dart index 2a2f558344..cc1298dff0 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: dd6f376925bfd278af7e925fcc63523f +Signature: 056116a9fe82097da9811ba9dcdf9939 ==================================================================================================== LIBRARY: dart @@ -4807,7 +4807,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/61bfa9bbb91d50754f6b6a2bef5629c9fd074e6f +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/470117150f34d712ee6d8c4558b3c656d973f656 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/engine/src/flutter/third_party/.gitignore b/engine/src/flutter/third_party/.gitignore index 5bd42c1696..bf3e9d89a4 100644 --- a/engine/src/flutter/third_party/.gitignore +++ b/engine/src/flutter/third_party/.gitignore @@ -1,6 +1,7 @@ # Ignore everything by default, as these come from gclient/DEPS. # We'll explicitly include the folders we want to track. /* +/boringssl/src # Include the .gitignore file itself and .clang-tidy. !.gitignore @@ -12,6 +13,7 @@ # Include folders that have hand-written code (not DEPS). !accessibility/ +!boringssl/ !canvaskit/ !spring_animation/ !test_shaders/ diff --git a/engine/src/flutter/tools/gn b/engine/src/flutter/tools/gn index 0fa741985a..ebc6a46254 100755 --- a/engine/src/flutter/tools/gn +++ b/engine/src/flutter/tools/gn @@ -569,10 +569,6 @@ def to_gn_args(args): else: gn_args['enable_backtrace'] = False - # Overrides whether Boring SSL is compiled with system as. Only meaningful - # on Android. - gn_args['bssl_use_clang_integrated_as'] = True - if args.allow_deprecated_api_calls: gn_args['allow_deprecated_api_calls'] = args.allow_deprecated_api_calls