Skip to content

Commit ae73888

Browse files
authored
Reland dart sdks that were causing dartaotruntime issues in g3 (#164307) (#164554)
This reverts commit 6ec7ae3 as g3 is believed to be in a good state to receive dart sdk changes.
1 parent 0a29489 commit ae73888

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

DEPS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ 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': 'b8292dfeaa67cd79e9dbbec71d3bd2daf6720568',
59+
'dart_revision': 'd70b123c77d4115f332652c9bb21ac46a2456889',
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': '3f6831c0bd147ae1ae0ab1d9187d37bce7cca38b',
64-
'dart_boringssl_rev': '0c59e9e55bdaadadf49f3c092b097e72cd4b39cc',
64+
'dart_boringssl_rev': 'daa03aac8d88f67c8b8d293ebc11d57f61ca6f8a',
6565
'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae',
6666
'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d',
6767
'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0',
@@ -310,7 +310,7 @@ deps = {
310310
Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535',
311311

312312
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
313-
Var('dart_git') + '/dartdoc.git@f0d2276e57c96717e625964ea0385a30f2237e62',
313+
Var('dart_git') + '/dartdoc.git@34561d6ebf5fa89ca1f93b981de96a75ff573562',
314314

315315
'engine/src/flutter/third_party/dart/third_party/pkg/http':
316316
Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'),
@@ -337,7 +337,7 @@ deps = {
337337
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
338338

339339
'engine/src/flutter/third_party/dart/third_party/pkg/test':
340-
Var('dart_git') + '/test.git@17609bf90c9d5ef47707f5796763629450382474',
340+
Var('dart_git') + '/test.git@a833663e56b6182f8372180f5c95d1c01b531150',
341341

342342
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
343343
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),

engine/src/flutter/ci/licenses_golden/excluded_files

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,10 +1650,8 @@
16501650
../../../flutter/third_party/dart/sdk/lib/_internal/fix_data.yaml
16511651
../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/OWNERS
16521652
../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/README
1653-
../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/.packages
16541653
../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/OWNERS
16551654
../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/README
1656-
../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/pubspec.yaml
16571655
../../../flutter/third_party/dart/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml
16581656
../../../flutter/third_party/dart/sdk/lib/_internal/vm/OWNERS
16591657
../../../flutter/third_party/dart/sdk/lib/_internal/wasm/OWNERS

engine/src/flutter/ci/licenses_golden/licenses_dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: bb042bae00f88159712b2037c6869d01
1+
Signature: 84f86b2f50789f61cb66540906661036
22

33
====================================================================================================
44
LIBRARY: dart
@@ -3716,7 +3716,6 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/regexp_patc
37163716
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart + ../../../flutter/third_party/dart/LICENSE
37173717
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart + ../../../flutter/third_party/dart/LICENSE
37183718
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart + ../../../flutter/third_party/dart/LICENSE
3719-
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart + ../../../flutter/third_party/dart/LICENSE
37203719
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart + ../../../flutter/third_party/dart/LICENSE
37213720
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart + ../../../flutter/third_party/dart/LICENSE
37223721
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.
37873786
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart
37883787
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart
37893788
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart
3790-
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart
37913789
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart
37923790
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart
37933791
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 +
38823880
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string.dart + ../../../flutter/third_party/dart/LICENSE
38833881
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart + ../../../flutter/third_party/dart/LICENSE
38843882
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_helper.dart + ../../../flutter/third_party/dart/LICENSE
3883+
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart + ../../../flutter/third_party/dart/LICENSE
38853884
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/sync_star_patch.dart + ../../../flutter/third_party/dart/LICENSE
38863885
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/typed_data.dart + ../../../flutter/third_party/dart/LICENSE
38873886
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
39443943
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string.dart
39453944
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart
39463945
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_helper.dart
3946+
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart
39473947
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/sync_star_patch.dart
39483948
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/typed_data.dart
39493949
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
48604860
This Source Code Form is "Incompatible With Secondary Licenses", as
48614861
defined by the Mozilla Public License, v. 2.0.
48624862

4863-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/7ceb3be8ed0a744b3ac2c363aab977f39051cc86
4863+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/d70b123c77d4115f332652c9bb21ac46a2456889
48644864
/third_party/fallback_root_certificates/
48654865

48664866
====================================================================================================

engine/src/flutter/sky/packages/sky_engine/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30249,7 +30249,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
3024930249
This Source Code Form is "Incompatible With Secondary Licenses", as
3025030250
defined by the Mozilla Public License, v. 2.0.
3025130251

30252-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/b8292dfeaa67cd79e9dbbec71d3bd2daf6720568
30252+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/d70b123c77d4115f332652c9bb21ac46a2456889
3025330253
/third_party/fallback_root_certificates/
3025430254

3025530255
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)