Skip to content

Commit 46b097a

Browse files
auto-submit[bot]auto-submit[bot]
andauthored
Reverts "Manual roll of Dart from 5ede85aff798 to 14ea8d342149 (flutter#172783)" (flutter#172900)
<!-- start_original_pr_link --> Reverts: flutter#172783 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: jtmcdole <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: Failing in post submit tests: ``` ╔═╡ERROR #1╞════════════════════════════════════════════════════════════════════ ║ UNEXPECTED ERROR! ║ Exception: Found unexpected binary in cache: /Volumes/Work/s/w/ir/x/w/flutter/bin/cache/dart-sdk/bin/dartvm ║ #0 verifyExist (file:///Volumes/Work/s/w/ir/x/w/flutter/dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart:198:9) ║ <asynchron <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: a-siva <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {jason-simmons} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: https://dart.googlesource.com/sdk.git/+log/5ede85aff798..14ea8d342149 https://dart.googlesource.com/sdk.git/+/refs/tags/3.10.0-36.0.dev https://dart.googlesource.com/sdk.git/+/refs/tags/3.10.0-35.0.dev https://dart.googlesource.com/sdk.git/+/refs/tags/3.10.0-34.0.dev https://dart.googlesource.com/sdk.git/+/refs/tags/3.10.0-33.0.dev https://dart.googlesource.com/sdk.git/+/refs/tags/3.10.0-32.0.dev https://dart.googlesource.com/sdk.git/+/refs/tags/3.10.0-31.0.dev https://dart.googlesource.com/sdk.git/+/refs/tags/3.10.0-30.0.dev https://dart.googlesource.com/sdk.git/+/refs/tags/3.10.0-29.0.dev <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <[email protected]>
1 parent 9ceb761 commit 46b097a

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ 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': '14ea8d3421493df84ecc88e8994092a3dad56420',
59+
'dart_revision': '5ede85aff7987feca316732cfce023aa85c1bdb8',
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
@@ -329,7 +329,7 @@ deps = {
329329
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
330330

331331
'engine/src/flutter/third_party/dart/third_party/pkg/native':
332-
Var('dart_git') + '/native.git@99ec5171caa1a28f9280e6ee4cb56780c1eff6c5',
332+
Var('dart_git') + '/native.git@cc5539fe3fd782629f13e05b0c83093862baf7ca',
333333

334334
'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
335335
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),

engine/src/flutter/ci/licenses_golden/licenses_dart

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: ed1b42cf9422e56184e28e996d99a52d
1+
Signature: db8e503b91c110102cba80e0fd002ad8
22

33
====================================================================================================
44
LIBRARY: dart
@@ -3361,6 +3361,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33613361

33623362
====================================================================================================
33633363
LIBRARY: dart
3364+
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dartdev_isolate.cc + ../../../flutter/third_party/dart/LICENSE
3365+
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dartdev_isolate.h + ../../../flutter/third_party/dart/LICENSE
33643366
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/exe_utils.cc + ../../../flutter/third_party/dart/LICENSE
33653367
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/exe_utils.h + ../../../flutter/third_party/dart/LICENSE
33663368
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/ffi_unit_test/run_ffi_unit_tests.cc + ../../../flutter/third_party/dart/LICENSE
@@ -3427,6 +3429,8 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/js_pa
34273429
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/ffi_struct_patch.dart + ../../../flutter/third_party/dart/LICENSE
34283430
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/internal/lowering.dart + ../../../flutter/third_party/dart/LICENSE
34293431
TYPE: LicenseType.bsd
3432+
FILE: ../../../flutter/third_party/dart/runtime/bin/dartdev_isolate.cc
3433+
FILE: ../../../flutter/third_party/dart/runtime/bin/dartdev_isolate.h
34303434
FILE: ../../../flutter/third_party/dart/runtime/bin/exe_utils.cc
34313435
FILE: ../../../flutter/third_party/dart/runtime/bin/exe_utils.h
34323436
FILE: ../../../flutter/third_party/dart/runtime/bin/ffi_unit_test/run_ffi_unit_tests.cc
@@ -3812,8 +3816,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38123816

38133817
====================================================================================================
38143818
LIBRARY: dart
3819+
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dart_test_component.cml + ../../../flutter/third_party/dart/LICENSE
38153820
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dartaotruntime_test_component.cml + ../../../flutter/third_party/dart/LICENSE
3816-
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dartvm_test_component.cml + ../../../flutter/third_party/dart/LICENSE
38173821
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/main_impl.h + ../../../flutter/third_party/dart/LICENSE
38183822
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/run_vm_tests_test_component.cml + ../../../flutter/third_party/dart/LICENSE
38193823
ORIGIN: ../../../flutter/third_party/dart/runtime/lib/ffi_dynamic_library.h + ../../../flutter/third_party/dart/LICENSE
@@ -3874,8 +3878,8 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/async/future_extensions.dart +
38743878
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/js_interop/js_interop.dart + ../../../flutter/third_party/dart/LICENSE
38753879
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/js_interop_unsafe/js_interop_unsafe.dart + ../../../flutter/third_party/dart/LICENSE
38763880
TYPE: LicenseType.bsd
3881+
FILE: ../../../flutter/third_party/dart/runtime/bin/dart_test_component.cml
38773882
FILE: ../../../flutter/third_party/dart/runtime/bin/dartaotruntime_test_component.cml
3878-
FILE: ../../../flutter/third_party/dart/runtime/bin/dartvm_test_component.cml
38793883
FILE: ../../../flutter/third_party/dart/runtime/bin/main_impl.h
38803884
FILE: ../../../flutter/third_party/dart/runtime/bin/run_vm_tests_test_component.cml
38813885
FILE: ../../../flutter/third_party/dart/runtime/lib/ffi_dynamic_library.h
@@ -4204,11 +4208,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
42044208

42054209
====================================================================================================
42064210
LIBRARY: dart
4207-
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/common_options.h + ../../../flutter/third_party/dart/LICENSE
42084211
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dart_api_win.c + ../../../flutter/third_party/dart/LICENSE
4209-
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dartdev.cc + ../../../flutter/third_party/dart/LICENSE
4210-
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dartdev_options.cc + ../../../flutter/third_party/dart/LICENSE
4211-
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dartdev_options.h + ../../../flutter/third_party/dart/LICENSE
42124212
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/macho_loader.cc + ../../../flutter/third_party/dart/LICENSE
42134213
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/macho_loader.h + ../../../flutter/third_party/dart/LICENSE
42144214
ORIGIN: ../../../flutter/third_party/dart/runtime/bin/mappable.cc + ../../../flutter/third_party/dart/LICENSE
@@ -4237,11 +4237,7 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/dynamic_mod
42374237
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/function_patch.dart + ../../../flutter/third_party/dart/LICENSE
42384238
ORIGIN: ../../../flutter/third_party/dart/utils/dart_mcp_server/dart_mcp_server.dart + ../../../flutter/third_party/dart/LICENSE
42394239
TYPE: LicenseType.bsd
4240-
FILE: ../../../flutter/third_party/dart/runtime/bin/common_options.h
42414240
FILE: ../../../flutter/third_party/dart/runtime/bin/dart_api_win.c
4242-
FILE: ../../../flutter/third_party/dart/runtime/bin/dartdev.cc
4243-
FILE: ../../../flutter/third_party/dart/runtime/bin/dartdev_options.cc
4244-
FILE: ../../../flutter/third_party/dart/runtime/bin/dartdev_options.h
42454241
FILE: ../../../flutter/third_party/dart/runtime/bin/macho_loader.cc
42464242
FILE: ../../../flutter/third_party/dart/runtime/bin/macho_loader.h
42474243
FILE: ../../../flutter/third_party/dart/runtime/bin/mappable.cc
@@ -4453,7 +4449,6 @@ FILE: ../../../flutter/third_party/dart/runtime/observatory/web/timeline.html
44534449
FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dart.plist
44544450
FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dartaotruntime.plist
44554451
FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dartaotruntime_product.plist
4456-
FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dartvm.plist
44574452
FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/gen_snapshot.plist
44584453
FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/gen_snapshot_product.plist
44594454
FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/run_futures_aot.plist
@@ -4897,7 +4892,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
48974892
This Source Code Form is "Incompatible With Secondary Licenses", as
48984893
defined by the Mozilla Public License, v. 2.0.
48994894

4900-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/14ea8d3421493df84ecc88e8994092a3dad56420
4895+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/5ede85aff7987feca316732cfce023aa85c1bdb8
49014896
/third_party/fallback_root_certificates/
49024897

49034898
====================================================================================================

0 commit comments

Comments
 (0)