Merge branch 'main' into larger_default_atlas

Author: Jonah Williams

.github/workflows/scorecards-analysis.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           persist-credentials: false
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534
         with:
           results_file: results.sarif
           results_format: sarif

.github/workflows/third_party_scan.yml

@@ -41,7 +41,7 @@ jobs:
     name: Vulnerability scanning
     needs:
       extract-deps
-    uses: "google/osv-scanner-action/.github/workflows/[email protected].1"
+    uses: "google/osv-scanner-action/.github/workflows/[email protected].3"
     with:
       # Download the artifact uploaded in extract-deps step
       download-artifact: osv-lockfile-${{github.sha}}

DEPS

@@ -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': '400c6fbeace8690d113df06b511cbeb45cf1cde9',
+  'skia_revision': '19153175a79b7afe01a3289da705b864c4effd32',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -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': '7c7767ecc3d76d12b83ac41ab101e8044ddcd19f',
+  'dart_revision': 'fe75fa5f7dc0dca6ff2da32beffea62e444da869',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -74,8 +74,8 @@ vars = {
   'dart_pub_rev': 'e184bfc725793cbbf222fa8d8f96da10c40af24a',
   'dart_tools_rev': 'd35d633e6df04f8a60a305a36437f67f9fefca5d',
   'dart_watcher_rev': '42308ea9e22bc2d1edab497ee58c0df0affbfed0',
-  'dart_web_rev': 'ff7185c6c0360987116115039a08d9134c8d62aa',
-  'dart_webdev_rev': 'c233e453d3172536d2e04575d752c1a7c0acae57',
+  'dart_web_rev': 'c36d962720b770c047fdb5255d51ac8713102090',
+  'dart_webdev_rev': '9108903103fe54c5941d8d54cc5a5cd0ad5529b2',
   'dart_webkit_inspection_protocol_rev': '5740cc91eaeb13a02007b77b128fccf4b056db6e',
   'dart_yaml_edit_rev': 'c4629ad7eec13ddf449918ab8a796e0403330e3f',
 
@@ -277,7 +277,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '7840a4af027fc21161d4ae14a3d4d9c9bab049a2',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '7f832aed9b02b6da55756234b85e753d0411855e',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -288,10 +288,10 @@ deps = {
   'src/flutter/third_party/harfbuzz':
    Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'ea8f97c615f0ba17dc25013ef67dbd6bfaaa76f2',
 
-  'src/third_party/libcxx':
+  'src/flutter/third_party/libcxx':
    Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',
 
-  'src/third_party/libcxxabi':
+  'src/flutter/third_party/libcxxabi':
    Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
 
   'src/flutter/third_party/glfw':
@@ -386,34 +386,34 @@ deps = {
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@6e9c1eae7ef0a1521e865dafbacc2c8a1d2fd9dd',
+   Var('dart_git') + '/dartdoc.git@2e706be82c4518401fda62b2996f9d9e2524955d',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@8ce0d13ffe9dac267bdbd6c65c145ba4f611af72',
 
   'src/flutter/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@2c9f25d5057ce4b450ea193a8501e9f79a1b1dc8',
+   Var('dart_git') + '/fixnum.git@ac892adead8317e22fafaec65a4e76bda1640f26',
 
   'src/flutter/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@44e8c22f9271a62b03d2551d1e7b7ac18d589f16',
+   Var('dart_git') + '/glob.git@ee48ea82a1ccb64c8cc62e9f4f44c44ca67add71',
 
   'src/flutter/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@44613e897fc80f2fcd43a355c98506df12fd38e2',
+   Var('dart_git') + '/html.git@00d34611eee5eff976bd12a631357a4d591ef5fb',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@dd31e64685b03a9700cc99d7b7fc637dd60c4d3a',
+   Var('dart_git') + '/http.git@fdb0d363ae29fb2df7214b2e24a5fea9521ced63',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@e45a674bf4d2552438e3632cdc40f303f4b01e74',
+   Var('dart_git') + '/http_multi_server.git@4a791af861da1cf53b57d9928fbc605f57139e4f',
 
   'src/flutter/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@ad0581078d45bfa3b2ded5b7d9a5f7797c8d109d',
+   Var('dart_git') + '/http_parser.git@702698a3fc726f7cbb8cd7824a8639c7fe84b169',
 
   'src/flutter/third_party/dart/third_party/pkg/intl':
    Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
 
   'src/flutter/third_party/dart/third_party/pkg/json_rpc_2':
-   Var('dart_git') + '/json_rpc_2.git@7547bb16a90dbd436d50dad93f2e7a9dc0956423',
+   Var('dart_git') + '/json_rpc_2.git@3187f7b59ed253d14b2560c5306b037bca6817b0',
 
   'src/flutter/third_party/dart/third_party/pkg/leak_tracker':
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
@@ -422,28 +422,28 @@ deps = {
    Var('dart_git') + '/logging.git@49d89b1de6e847174bc93b709e858b99e61b2ae7',
 
   'src/flutter/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@6aaa152f30255cc660d387b6e4e34543afbb277c',
+   Var('dart_git') + '/markdown.git@7463999481212e8708b7ab7ff8429b8f552ad30c',
 
   'src/flutter/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@b42bf10b0da3e5b748bbc51bdc1dfaeacf824563',
+   Var('dart_git') + '/matcher.git@4ac4096facce24a781ab6609ca99995aeb443b25',
 
   'src/flutter/third_party/dart/third_party/pkg/mime':
    Var('dart_git') + '/mime.git@b01c9a24e0991da479bd405138be3b3e403ff456',
 
   'src/flutter/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@81ecb88b631a9c1e677852a33ad916238dee0ef2',
+   Var('dart_git') + '/mockito.git@4be52e16d06c8c5384d1cf5a511f0c9a7d829cf7',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
    Var('dart_git') + '/native.git@1a6faf502c01c598ce8ed6c77ea22c29774dbf34',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@a36e496d61937a800c22f68035dc98bf8ead7fb2',
+   Var('dart_git') + '/package_config.git@39096768806ccae4b7025dd4114f15f2df424b0c',
 
   'src/flutter/third_party/dart/third_party/pkg/path':
-   Var('dart_git') + '/path.git@f411b96a2598d3911b485d606430fd775fd9e41a',
+   Var('dart_git') + '/path.git@9be79e72be7837fd8b99ae51a69f4c9f04ec29b4',
 
   'src/flutter/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@e6df05a287a2193c4c566608f9cd12e8689d3264',
+   Var('dart_git') + '/pool.git@1a6f2df19d7a24baaf674e032a0310a4f76725de',
 
   'src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -452,10 +452,10 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@df834e180f86b6dac8ef0222a28987009ad75a75',
+   Var('dart_git') + '/pub_semver.git@f57c9c31dfd4e45ce6b11f18ee388e526ba1792a',
 
   'src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@c8d8058e426bd6a874dd4ded29cd88216e248387',
+   Var('dart_git') + '/shelf.git@d9f82bf2cdd87e2878cfdc167aa41b9ce87a52d8',
 
   'src/flutter/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@4671c20004a89a3eabd150f2fc65bcf4319bba49',
@@ -485,10 +485,10 @@ deps = {
    Var('dart_git') + '/term_glyph.git@c3e323bcfe3f992c2b3059e141eb5ccbc1ba39c4',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@0562baf0994ee76fcdcc55bf1d70e00ddeed44f3',
+   Var('dart_git') + '/test.git@84d2a2bcba0d63b9f4bd6cbf14fb7fc38621e65d',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
-   Var('dart_git') + '/test_reflective_loader.git@537ab5b24632c03918fb229531cfb41946eeae27',
+   Var('dart_git') + '/test_reflective_loader.git@f8807e0e5816e30ab592424e3916fee90b90623e',
 
   'src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -503,7 +503,7 @@ deps = {
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@d86313dfb30fbc4c15c53424c3d637559ad978e1',
+   Var('dart_git') + '/web_socket_channel.git@5f65bae1ac59ecfc9da49db9b86386b6fe412615',
 
   'src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),

build/secondary/third_party/libcxx/BUILD.gn renamed to build/secondary/flutter/third_party/libcxx/BUILD.gn

@@ -4,7 +4,7 @@
 
 config("libcxx_config") {
   defines = [ "_LIBCPP_DISABLE_AVAILABILITY=1" ]
-  include_dirs = [ "//flutter/build/secondary/third_party/libcxx/config" ]
+  include_dirs = [ "//flutter/build/secondary/flutter/third_party/libcxx/config" ]
 }
 
 config("src_include") {
@@ -56,7 +56,7 @@ source_set("libcxx") {
     "src/vector.cpp",
   ]
 
-  deps = [ "//third_party/libcxxabi" ]
+  deps = [ "//flutter/third_party/libcxxabi" ]
 
   # TODO(goderbauer): remove when all sources build with LTO for android_arm64 and android_x64.
   if (is_android && (current_cpu == "arm64" || current_cpu == "x64")) {
@@ -66,7 +66,7 @@ source_set("libcxx") {
 
   public_configs = [
     ":libcxx_config",
-    "//third_party/libcxxabi:libcxxabi_config",
+    "//flutter/third_party/libcxxabi:libcxxabi_config",
   ]
 
   defines = [
@@ -101,11 +101,11 @@ source_set("libcxx_nolto") {
 
   cflags_cc = [ "-fno-lto" ]
 
-  deps = [ "//third_party/libcxxabi" ]
+  deps = [ "//flutter/third_party/libcxxabi" ]
 
   public_configs = [
     ":libcxx_config",
-    "//third_party/libcxxabi:libcxxabi_config",
+    "//flutter/third_party/libcxxabi:libcxxabi_config",
   ]
 
   defines = [

build/secondary/third_party/libcxx/config/__config_site renamed to build/secondary/flutter/third_party/libcxx/config/__config_site

@@ -38,7 +38,7 @@ source_set("libcxxabi") {
   configs -= [ "//build/config/compiler:cxx_version_default" ]
   configs += [ "//build/config/compiler:cxx_version_20" ]
 
-  configs += [ "//third_party/libcxx:src_include" ]
+  configs += [ "//flutter/third_party/libcxx:src_include" ]
 
   # No translation units in the engine are built with exceptions. But, using
   # Objective-C exceptions requires some infrastructure setup for exceptions.

build/secondary/third_party/libcxxabi/BUILD.gn renamed to build/secondary/flutter/third_party/libcxxabi/BUILD.gn

@@ -174,7 +174,7 @@ function verify_licenses() (
 
   local actualLicenseCount
   actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
-  local expectedLicenseCount=899 # When changing this number: Update the error message below as well describing the newly expected license types.
+  local expectedLicenseCount=903 # When changing this number: Update the error message below as well describing the newly expected license types.
 
   if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
     echo "=============================== ERROR ==============================="

ci/licenses.sh

@@ -2093,6 +2093,41 @@
 ../../../flutter/third_party/json/tools/serve_header/README.md
 ../../../flutter/third_party/json/tools/serve_header/requirements.txt
 ../../../flutter/third_party/json/tools/serve_header/serve_header.py
+../../../flutter/third_party/libcxx/.clang-format
+../../../flutter/third_party/libcxx/.clang-tidy
+../../../flutter/third_party/libcxx/.git
+../../../flutter/third_party/libcxx/.gitignore
+../../../flutter/third_party/libcxx/CMakeLists.txt
+../../../flutter/third_party/libcxx/CREDITS.TXT
+../../../flutter/third_party/libcxx/TODO.TXT
+../../../flutter/third_party/libcxx/appveyor-reqs-install.cmd
+../../../flutter/third_party/libcxx/appveyor.yml
+../../../flutter/third_party/libcxx/benchmarks
+../../../flutter/third_party/libcxx/cmake
+../../../flutter/third_party/libcxx/docs
+../../../flutter/third_party/libcxx/include/CMakeLists.txt
+../../../flutter/third_party/libcxx/include/version
+../../../flutter/third_party/libcxx/lib/abi/CHANGELOG.TXT
+../../../flutter/third_party/libcxx/lib/abi/CMakeLists.txt
+../../../flutter/third_party/libcxx/lib/abi/README.TXT
+../../../flutter/third_party/libcxx/src/CMakeLists.txt
+../../../flutter/third_party/libcxx/src/ryu/README.txt
+../../../flutter/third_party/libcxx/src/support/solaris
+../../../flutter/third_party/libcxx/test
+../../../flutter/third_party/libcxx/utils
+../../../flutter/third_party/libcxxabi/.clang-format
+../../../flutter/third_party/libcxxabi/.git
+../../../flutter/third_party/libcxxabi/.gitignore
+../../../flutter/third_party/libcxxabi/CMakeLists.txt
+../../../flutter/third_party/libcxxabi/CREDITS.TXT
+../../../flutter/third_party/libcxxabi/cmake
+../../../flutter/third_party/libcxxabi/fuzz/CMakeLists.txt
+../../../flutter/third_party/libcxxabi/include/CMakeLists.txt
+../../../flutter/third_party/libcxxabi/src/CMakeLists.txt
+../../../flutter/third_party/libcxxabi/src/demangle/.clang-format
+../../../flutter/third_party/libcxxabi/src/demangle/README.txt
+../../../flutter/third_party/libcxxabi/test
+../../../flutter/third_party/libcxxabi/www
 ../../../flutter/third_party/libjpeg-turbo/src/.git
 ../../../flutter/third_party/libjpeg-turbo/src/.gitignore
 ../../../flutter/third_party/libjpeg-turbo/src/BUILDING.md
@@ -3509,43 +3544,5 @@
 ../../../fuchsia/sdk/linux/tools
 ../../../fuchsia/sdk/linux/version_history.json
 ../../../out
-../../../third_party/android_embedding_dependencies
-../../../third_party/gradle
-../../../third_party/java
-../../../third_party/libcxx/.clang-format
-../../../third_party/libcxx/.clang-tidy
-../../../third_party/libcxx/.git
-../../../third_party/libcxx/.gitignore
-../../../third_party/libcxx/CMakeLists.txt
-../../../third_party/libcxx/CREDITS.TXT
-../../../third_party/libcxx/TODO.TXT
-../../../third_party/libcxx/appveyor-reqs-install.cmd
-../../../third_party/libcxx/appveyor.yml
-../../../third_party/libcxx/benchmarks
-../../../third_party/libcxx/cmake
-../../../third_party/libcxx/docs
-../../../third_party/libcxx/include/CMakeLists.txt
-../../../third_party/libcxx/include/version
-../../../third_party/libcxx/lib/abi/CHANGELOG.TXT
-../../../third_party/libcxx/lib/abi/CMakeLists.txt
-../../../third_party/libcxx/lib/abi/README.TXT
-../../../third_party/libcxx/src/CMakeLists.txt
-../../../third_party/libcxx/src/ryu/README.txt
-../../../third_party/libcxx/src/support/solaris
-../../../third_party/libcxx/test
-../../../third_party/libcxx/utils
-../../../third_party/libcxxabi/.clang-format
-../../../third_party/libcxxabi/.git
-../../../third_party/libcxxabi/.gitignore
-../../../third_party/libcxxabi/CMakeLists.txt
-../../../third_party/libcxxabi/CREDITS.TXT
-../../../third_party/libcxxabi/cmake
-../../../third_party/libcxxabi/fuzz/CMakeLists.txt
-../../../third_party/libcxxabi/include/CMakeLists.txt
-../../../third_party/libcxxabi/src/CMakeLists.txt
-../../../third_party/libcxxabi/src/demangle/.clang-format
-../../../third_party/libcxxabi/src/demangle/README.txt
-../../../third_party/libcxxabi/test
-../../../third_party/libcxxabi/www
-../../../third_party/web_dependencies/canvaskit
+../../../third_party
 ../../../tools

ci/licenses_golden/excluded_files

@@ -1,4 +1,4 @@
-Signature: 72397387470828423622eeb5ed65f63b
+Signature: a441dfe7b18f28cc1eb5c9667ab47412
 
 ====================================================================================================
 LIBRARY: dart
@@ -4741,7 +4741,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/+/7c7767ecc3d76d12b83ac41ab101e8044ddcd19f
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/fe75fa5f7dc0dca6ff2da32beffea62e444da869
 /third_party/fallback_root_certificates/
 
 ====================================================================================================