From 5e7994be0c5ff7c7fd93ffb57e8bb8745595bb26 Mon Sep 17 00:00:00 2001 From: Siva Date: Fri, 8 Nov 2024 13:57:39 -0800 Subject: [PATCH] Manual roll Dart SDK from cfa1826c3df1 to 307869c696e8 (1 revision) (flutter/engine#56460) https://dart.googlesource.com/sdk.git/+log/cfa1826c3df1..307869c696e8 2024-11-08 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.7.0-121.0.dev --------- Co-authored-by: skia-flutter-autoroll --- DEPS | 2 +- engine/src/flutter/ci/licenses_golden/licenses_dart | 12 ++++++------ engine/src/flutter/runtime/BUILD.gn | 2 +- .../shell/platform/fuchsia/dart_runner/BUILD.gn | 12 ++++++------ .../flutter/shell/platform/fuchsia/flutter/BUILD.gn | 8 ++++---- engine/src/flutter/sky/packages/sky_engine/LICENSE | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/DEPS b/DEPS index b3415502aba..01a76993dc9 100644 --- a/DEPS +++ b/DEPS @@ -56,7 +56,7 @@ 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': 'cfa1826c3df126e6371391af9ee29bd0a771e4cc', + 'dart_revision': '307869c696e8003257ca3666f3c89e22f2a379a9', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py diff --git a/engine/src/flutter/ci/licenses_golden/licenses_dart b/engine/src/flutter/ci/licenses_golden/licenses_dart index f1217618a9b..944bdee2342 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: 059b4219d4c5ab12d09772f435c139e9 +Signature: ad943b3dce1d3415bb8663e604f48d55 ==================================================================================================== LIBRARY: dart @@ -3842,8 +3842,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: dart -ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dart_precompiled_runtime_test_component.cml + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dart_test_component.cml + ../../../flutter/third_party/dart/LICENSE +ORIGIN: ../../../flutter/third_party/dart/runtime/bin/dartaotruntime_test_component.cml + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/runtime/bin/main_impl.h + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/runtime/bin/run_vm_tests_test_component.cml + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/runtime/lib/ffi_dynamic_library.h + ../../../flutter/third_party/dart/LICENSE @@ -3904,8 +3904,8 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/async/future_extensions.dart + ORIGIN: ../../../flutter/third_party/dart/sdk/lib/js_interop/js_interop.dart + ../../../flutter/third_party/dart/LICENSE ORIGIN: ../../../flutter/third_party/dart/sdk/lib/js_interop_unsafe/js_interop_unsafe.dart + ../../../flutter/third_party/dart/LICENSE TYPE: LicenseType.bsd -FILE: ../../../flutter/third_party/dart/runtime/bin/dart_precompiled_runtime_test_component.cml FILE: ../../../flutter/third_party/dart/runtime/bin/dart_test_component.cml +FILE: ../../../flutter/third_party/dart/runtime/bin/dartaotruntime_test_component.cml FILE: ../../../flutter/third_party/dart/runtime/bin/main_impl.h FILE: ../../../flutter/third_party/dart/runtime/bin/run_vm_tests_test_component.cml FILE: ../../../flutter/third_party/dart/runtime/lib/ffi_dynamic_library.h @@ -4380,8 +4380,8 @@ FILE: ../../../flutter/third_party/dart/runtime/observatory/web/index.html FILE: ../../../flutter/third_party/dart/runtime/observatory/web/third_party/trace_viewer_full.html FILE: ../../../flutter/third_party/dart/runtime/observatory/web/timeline.html FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dart.plist -FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dart_precompiled_runtime.plist -FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dart_precompiled_runtime_product.plist +FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dartaotruntime.plist +FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dartaotruntime_product.plist FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/gen_snapshot.plist FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/gen_snapshot_product.plist FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/run_vm_tests.plist @@ -4805,7 +4805,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/+/6a3684b961213427ba63c28ba3c438dc5a356eef +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/307869c696e8003257ca3666f3c89e22f2a379a9 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/engine/src/flutter/runtime/BUILD.gn b/engine/src/flutter/runtime/BUILD.gn index 80e5c372a40..5c75d2f4cb2 100644 --- a/engine/src/flutter/runtime/BUILD.gn +++ b/engine/src/flutter/runtime/BUILD.gn @@ -29,7 +29,7 @@ group("libdart") { public_deps = [] if (flutter_runtime_mode == "profile" || flutter_runtime_mode == "release") { - public_deps += [ "$dart_src/runtime:libdart_precompiled_runtime" ] + public_deps += [ "$dart_src/runtime:libdart_aotruntime" ] } else { public_deps += [ "$dart_src/runtime:libdart_jit", diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn index 1a626e1f7af..c42682d0f54 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -137,8 +137,8 @@ runner("dart_aot_runner_bin") { extra_defines += [ "FLUTTER_PROFILE" ] } extra_deps = [ - "$dart_src/runtime:libdart_precompiled_runtime", - "$dart_src/runtime/platform:libdart_platform_precompiled_runtime", + "$dart_src/runtime:libdart_aotruntime", + "$dart_src/runtime/platform:libdart_platform_aotruntime", "embedder:dart_aot_snapshot_cc", ] } @@ -151,8 +151,8 @@ runner("dart_aot_product_runner_bin") { "DART_PRODUCT", ] extra_deps = [ - "$dart_src/runtime:libdart_precompiled_runtime", - "$dart_src/runtime/platform:libdart_platform_precompiled_runtime", + "$dart_src/runtime:libdart_aotruntime", + "$dart_src/runtime/platform:libdart_platform_aotruntime", "embedder:dart_aot_product_snapshot_cc", ] } @@ -170,8 +170,8 @@ template("aot_runner_package") { "vmservice:vmservice_snapshot", "//flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols:dart_aot_runner", - # TODO(kaushikiska): Figure out how to get the profiler symbols for `libdart_precompiled_runtime` - # "$dart_src/runtime:libdart_precompiled_runtime", + # TODO(kaushikiska): Figure out how to get the profiler symbols for `libdart_aotruntime` + # "$dart_src/runtime:libdart_aotruntime", observatory_target, ] } diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn index 2ab8725ee6d..fad29d220bd 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn @@ -278,8 +278,8 @@ flutter_runner("aot") { product = false extra_deps = [ - "$dart_src/runtime:libdart_precompiled_runtime", - "$dart_src/runtime/platform:libdart_platform_precompiled_runtime", + "$dart_src/runtime:libdart_aotruntime", + "$dart_src/runtime/platform:libdart_platform_aotruntime", ] } @@ -288,8 +288,8 @@ flutter_runner("aot_product") { product = true extra_deps = [ - "$dart_src/runtime:libdart_precompiled_runtime", - "$dart_src/runtime/platform:libdart_platform_precompiled_runtime", + "$dart_src/runtime:libdart_aotruntime", + "$dart_src/runtime/platform:libdart_platform_aotruntime", ] } diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index 5359808e250..5743af7c5a0 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -32253,7 +32253,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/+/cfa1826c3df126e6371391af9ee29bd0a771e4cc +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/307869c696e8003257ca3666f3c89e22f2a379a9 /third_party/fallback_root_certificates/ --------------------------------------------------------------------------------