Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge branch 'main' of github.com:flutter/engine into align_path
  • Loading branch information
jonahwilliams committed Sep 13, 2024
commit 8accf3e4c474dbd7e08b68789d2363f9961bed8c
24 changes: 12 additions & 12 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vars = {
'flutter_git': 'https://flutter.googlesource.com',
'skia_git': 'https://skia.googlesource.com',
'llvm_git': 'https://llvm.googlesource.com',
'skia_revision': '06cd203d0607e1c7b3e25d9f08eb2c67c11c268c',
'skia_revision': '515a23f3cbe1e2f54ffa6821e6da6f4891763f47',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down Expand Up @@ -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': '0f783bdb7a4d7b73187fe5d2971eb98149235c80',
'dart_revision': '23fc7751b8b264ee408c59d3ed558c257ccc2b52',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand All @@ -66,16 +66,16 @@ vars = {
'dart_browser_launcher_rev': 'fa98c77e7a2fee21a4ad3528dd79da0f4df6bd0f',
'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
'dart_devtools_rev': '25053ae4af8f162188388c6f3786e03349652e51',
'dart_devtools_rev': 'f363ca0a9d233cbf238465185ab09d90cbcc75dd',
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
'dart_pub_rev': '31fa75baa5872e7f094a554c0ec7741742889530',
'dart_tools_rev': 'b98c535537101eff0484ba279bd4090a5b9ac2ad',
'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
'dart_web_rev': '4996dc2acd30ff06f7e500ec76fde8a66db82c0c',
'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
'dart_web_rev': 'fb3019264edbed87b40c29d7777b2f98ae562008',
'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c',
'dart_webkit_inspection_protocol_rev': '119b877ae82bd2ca4cf7e5144d3a5ec104055164',
'dart_yaml_edit_rev': '5c54d455f272bbb83c948ac420c677371e69ae77',

Expand Down Expand Up @@ -278,7 +278,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '6ef931b950d5b9477dba0e278b7006ae327e12f7',
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f85c3be4bf808add6ba867b8ff7943fd235b7b5e',

'src/flutter/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
Expand Down Expand Up @@ -348,7 +348,7 @@ deps = {
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@459bc0797f67cb2a8fd4598bb7143b34036608d9',

'src/flutter/third_party/dart/third_party/devtools':
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:25053ae4af8f162188388c6f3786e03349652e51'}]},
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:f363ca0a9d233cbf238465185ab09d90cbcc75dd'}]},

'src/flutter/third_party/dart/third_party/pkg/args':
Var('dart_git') + '/args.git@1a24d614423e7861ae2e341bfb19050959cef0cd',
Expand Down Expand Up @@ -384,10 +384,10 @@ deps = {
Var('dart_git') + '/csslib.git@192d720f121792ab05ca157ea280edc7e0410e9c',

'src/flutter/third_party/dart/third_party/pkg/dart_style':
Var('dart_git') + '/dart_style.git@f7bd4c42ad6015143f08931540631448048f692d',
Var('dart_git') + '/dart_style.git@5d35f4d829ffb8532d345d95d3e9504ae6cd839e',

'src/flutter/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@b4449742c0f7d7fa0179897cac163388e03236c2',
Var('dart_git') + '/dartdoc.git@8100ccf1c1b8a462fd08adcc0cfd8db0f941f44a',

'src/flutter/third_party/dart/third_party/pkg/file':
Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
Expand Down Expand Up @@ -432,7 +432,7 @@ deps = {
Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',

'src/flutter/third_party/dart/third_party/pkg/native':
Var('dart_git') + '/native.git@5e9e4795d1faa39efeb92ae42fc0fa353778308f',
Var('dart_git') + '/native.git@75805b2f46d747643af3fb71c2abc84296ba4e32',

'src/flutter/third_party/dart/third_party/pkg/package_config':
Var('dart_git') + '/package_config.git@76934c2ca25922ec72909bbff7dfbddaf0d02bd9',
Expand Down Expand Up @@ -780,7 +780,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/embedding_bundle',
'version': 'last_updated:2024-06-18T12:13:41-0700'
'version': 'last_updated:2024-09-10T16:32:16-0700'
}
],
'condition': 'download_android_deps',
Expand Down Expand Up @@ -964,7 +964,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/sdk/core/linux-amd64',
'version': 'BF-8UyvqW5l52-hP2WmO_qUHb4BjNmA1U-b8708uan4C'
'version': '3YH1DEYJ-s93fHBw5YF3s-d0q40hqjb2-MmAPHb94iwC'
}
],
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ dart --version
# Runs the tests for the license script.
function run_tests() (
cd "$SRC_DIR/flutter/tools/licenses"
find . -name "*_test.dart" | xargs -n 1 dart -enable-asserts
find . -name "*_test.dart" | xargs -n 1 dart --enable-asserts
)

# Collects the license information from the repo.
Expand Down
5 changes: 2 additions & 3 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
../../../flutter/display_list/effects/dl_image_filter_unittests.cc
../../../flutter/display_list/effects/dl_mask_filter_unittests.cc
../../../flutter/display_list/geometry/dl_geometry_types_unittests.cc
../../../flutter/display_list/geometry/dl_path_unittests.cc
../../../flutter/display_list/geometry/dl_region_unittests.cc
../../../flutter/display_list/geometry/dl_rtree_unittests.cc
../../../flutter/display_list/skia/dl_sk_conversions_unittests.cc
Expand Down Expand Up @@ -211,9 +212,6 @@
../../../flutter/impeller/renderer/renderer_unittests.cc
../../../flutter/impeller/renderer/testing
../../../flutter/impeller/runtime_stage/runtime_stage_unittests.cc
../../../flutter/impeller/scene/README.md
../../../flutter/impeller/scene/importer/importer_unittests.cc
../../../flutter/impeller/scene/scene_unittests.cc
../../../flutter/impeller/shader_archive/shader_archive_unittests.cc
../../../flutter/impeller/tessellator/dart/.dart_tool
../../../flutter/impeller/tessellator/dart/pubspec.yaml
Expand Down Expand Up @@ -3619,6 +3617,7 @@
../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/meta.json
../../../fuchsia/sdk/linux/pkg/sys_service_cpp/meta.json
../../../fuchsia/sdk/linux/pkg/syslog/meta.json
../../../fuchsia/sdk/linux/pkg/syslog_cpp/meta.json
../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/meta.json
../../../fuchsia/sdk/linux/pkg/sysroot/meta.json
../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/meta.json
Expand Down
12 changes: 6 additions & 6 deletions ci/licenses_golden/licenses_dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 0d1eb1503a6d5425fca3b40d86a66cfb
Signature: f4e7946ef4ed3c88821cf1a23c476c94

====================================================================================================
LIBRARY: dart
Expand Down Expand Up @@ -3695,14 +3695,13 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/vm/simulator_x64.cc + ../../..
ORIGIN: ../../../flutter/third_party/dart/runtime/vm/simulator_x64.h + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_http/http_testing.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_names.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/load_library_priority.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/js_util_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/synced/embedded_names.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_finalizer_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/finalizer_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/hash_factories.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/record_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/bool.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/boxed_bool.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/class_id.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/convert_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/core_patch.dart + ../../../flutter/third_party/dart/LICENSE
Expand Down Expand Up @@ -3767,14 +3766,13 @@ FILE: ../../../flutter/third_party/dart/runtime/vm/simulator_x64.cc
FILE: ../../../flutter/third_party/dart/runtime/vm/simulator_x64.h
FILE: ../../../flutter/third_party/dart/sdk/lib/_http/http_testing.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_names.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/load_library_priority.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/js_util_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/synced/embedded_names.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_finalizer_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/finalizer_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/hash_factories.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/record_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/bool.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/boxed_bool.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/class_id.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/convert_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/core_patch.dart
Expand Down Expand Up @@ -4100,6 +4098,7 @@ ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_t
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/synced/async_status_codes.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/concurrent_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/ffi_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/js_helper_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/js_helper_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/concurrent/concurrent.dart + ../../../flutter/third_party/dart/LICENSE
Expand Down Expand Up @@ -4144,6 +4143,7 @@ FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_tim
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/synced/async_status_codes.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/vm/lib/concurrent_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/ffi_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/js_helper_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/js_helper_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/concurrent/concurrent.dart
Expand Down Expand Up @@ -4785,7 +4785,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/+/0f783bdb7a4d7b73187fe5d2971eb98149235c80
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/23fc7751b8b264ee408c59d3ed558c257ccc2b52
/third_party/fallback_root_certificates/

====================================================================================================
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.