firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reland dart sdks that were causing dartaotruntime issues in g3 (#164307) (#164554)

Browse Source 
This reverts commit 6ec7ae3a1c0bc9e32bdbb7e53da216ec35404bcb as g3 is
believed to be in a good state to receive dart sdk changes.
This commit is contained in:
Alexander Aprelev 2025-03-04 10:01:28 -08:00 committed by GitHub
parent 0a294891b6
commit ae7388838c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DEPS
View File

@ -56,12 +56,12 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
# You can use //tools/dart/create_updated_flutter_deps.py to produce # You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies. # updated revision list of existing dependencies.
'dart_revision': 'b8292dfeaa67cd79e9dbbec71d3bd2daf6720568', 'dart_revision': 'd70b123c77d4115f332652c9bb21ac46a2456889',
# WARNING: DO NOT EDIT MANUALLY # WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
'dart_binaryen_rev': '3f6831c0bd147ae1ae0ab1d9187d37bce7cca38b', 'dart_binaryen_rev': '3f6831c0bd147ae1ae0ab1d9187d37bce7cca38b',
'dart_boringssl_rev': '0c59e9e55bdaadadf49f3c092b097e72cd4b39cc', 'dart_boringssl_rev': 'daa03aac8d88f67c8b8d293ebc11d57f61ca6f8a',
'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae', 'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae',
'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d', 'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d',
'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0', 'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0',
@ -310,7 +310,7 @@ deps = {
Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535', Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535',
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc': 'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@f0d2276e57c96717e625964ea0385a30f2237e62', Var('dart_git') + '/dartdoc.git@34561d6ebf5fa89ca1f93b981de96a75ff573562',
'engine/src/flutter/third_party/dart/third_party/pkg/http': 'engine/src/flutter/third_party/dart/third_party/pkg/http':
Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'), Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'),
@ -337,7 +337,7 @@ deps = {
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a', Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
'engine/src/flutter/third_party/dart/third_party/pkg/test': 'engine/src/flutter/third_party/dart/third_party/pkg/test':
Var('dart_git') + '/test.git@17609bf90c9d5ef47707f5796763629450382474', Var('dart_git') + '/test.git@a833663e56b6182f8372180f5c95d1c01b531150',
'engine/src/flutter/third_party/dart/third_party/pkg/tools': 'engine/src/flutter/third_party/dart/third_party/pkg/tools':
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'), Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),

2
engine/src/flutter/ci/licenses_golden/excluded_files
View File

@ -1650,10 +1650,8 @@
../../../flutter/third_party/dart/sdk/lib/_internal/fix_data.yaml ../../../flutter/third_party/dart/sdk/lib/_internal/fix_data.yaml
../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/OWNERS ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/OWNERS
../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/README ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/README
../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/.packages
../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/OWNERS ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/OWNERS
../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/README ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/README
../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/pubspec.yaml
../../../flutter/third_party/dart/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml ../../../flutter/third_party/dart/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml
../../../flutter/third_party/dart/sdk/lib/_internal/vm/OWNERS ../../../flutter/third_party/dart/sdk/lib/_internal/vm/OWNERS
../../../flutter/third_party/dart/sdk/lib/_internal/wasm/OWNERS ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/OWNERS

8
engine/src/flutter/ci/licenses_golden/licenses_dart
View File

@ -1,4 +1,4 @@
Signature: bb042bae00f88159712b2037c6869d01 Signature: 84f86b2f50789f61cb66540906661036
==================================================================================================== ====================================================================================================
LIBRARY: dart LIBRARY: dart
@ -3716,7 +3716,6 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/regexp_patc
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/type.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/type.dart + ../../../flutter/third_party/dart/LICENSE
@ -3787,7 +3786,6 @@ FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/regexp_patch.
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/type.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/type.dart
@ -3882,6 +3880,7 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/simd.dart +
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_helper.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_helper.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/sync_star_patch.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/sync_star_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/typed_data.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/typed_data.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/wasm_types_patch.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/wasm_types_patch.dart + ../../../flutter/third_party/dart/LICENSE
@ -3944,6 +3943,7 @@ FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/simd.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_helper.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_helper.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/sync_star_patch.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/sync_star_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/typed_data.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/typed_data.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/wasm_types_patch.dart FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/wasm_types_patch.dart
@ -4860,7 +4860,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
This Source Code Form is "Incompatible With Secondary Licenses", as This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0. 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/+/7ceb3be8ed0a744b3ac2c363aab977f39051cc86 You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/d70b123c77d4115f332652c9bb21ac46a2456889
/third_party/fallback_root_certificates/ /third_party/fallback_root_certificates/
==================================================================================================== ====================================================================================================

2
engine/src/flutter/sky/packages/sky_engine/LICENSE
View File

@ -30249,7 +30249,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
This Source Code Form is "Incompatible With Secondary Licenses", as This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0. 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/+/b8292dfeaa67cd79e9dbbec71d3bd2daf6720568 You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/d70b123c77d4115f332652c9bb21ac46a2456889
/third_party/fallback_root_certificates/ /third_party/fallback_root_certificates/
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------