Merge branch 'flutter:main' into download-font-concurrently

Author: alanwutang11

.ci.yaml

@@ -312,10 +312,11 @@ targets:
 
   - name: Mac mac_host_engine
     recipe: engine_v2/engine_v2
+    bringup: true
     timeout: 60
     properties:
       config_name: mac_host_engine
-      environment: Production
+      environment: Staging
 
   - name: Mac Unopt
     recipe: engine/engine_unopt

.github/workflows/scorecards-analysis.yml

@@ -15,11 +15,11 @@ jobs:
     if: ${{ github.repository == 'flutter/engine' }}
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           persist-credentials: false
       - name: "setup python"
-        uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5
+        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984
         with:
           python-version: '3.7.7' # install the python version needed
       - name: "execute py script"
@@ -38,7 +38,7 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           persist-credentials: false
       - name: "Run analysis"
@@ -65,6 +65,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44
+        uses: github/codeql-action/upload-sarif@807578363a7869ca324a79039e6db9c843e0e100
         with:
           sarif_file: results.sarif

BUILD.gn

@@ -12,6 +12,8 @@ import("//third_party/dart/build/dart/copy_tree.gni")
 
 # Whether to build the dartdevc sdk, libraries, and source files
 # required for the flutter web sdk.
+# TODO(jacksongardner): remove this poorly named argument once the recipes stop
+# using it. https://github.com/flutter/flutter/issues/113303
 declare_args() {
   full_dart_sdk = false
 }
@@ -44,30 +46,6 @@ config("export_dynamic_symbols") {
   }
 }
 
-if (flutter_prebuilt_dart_sdk) {
-  copy_trees("_copy_trees") {
-    sources = [
-      {
-        target = "copy_dart_sdk"
-        visibility = [ ":dart_sdk" ]
-        source = prebuilt_dart_sdk
-        dest = "$root_out_dir/dart-sdk"
-        ignore_patterns = "{}"
-      },
-    ]
-  }
-}
-
-group("dart_sdk") {
-  if (build_engine_artifacts) {
-    if (flutter_prebuilt_dart_sdk) {
-      public_deps = [ ":copy_dart_sdk" ]
-    } else {
-      public_deps = [ "//third_party/dart:create_sdk" ]
-    }
-  }
-}
-
 group("flutter") {
   testonly = true
 
@@ -96,7 +74,7 @@ group("flutter") {
 
     if (build_engine_artifacts) {
       public_deps += [
-        ":dart_sdk",
+        "//flutter/build/dart:dart_sdk",
         "//flutter/flutter_frontend_server:frontend_server",
 
         # This must be listed explicitly for desktop cross-builds since
@@ -135,6 +113,7 @@ group("flutter") {
       "//flutter/display_list:display_list_benchmarks",
       "//flutter/display_list:display_list_builder_benchmarks",
       "//flutter/fml:fml_benchmarks",
+      "//flutter/impeller/geometry:geometry_benchmarks",
       "//flutter/lib/ui:ui_benchmarks",
       "//flutter/shell/common:shell_benchmarks",
       "//flutter/third_party/txt:txt_benchmarks",

DEPS

@@ -18,7 +18,7 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '79fd56ba7ff7984597fc6ffedf6f4f4160e52a07',
+  'skia_revision': 'fc7d5c9ee97044429fa226dd765215cd4a83c5b6',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -35,30 +35,30 @@ vars = {
   # The list of revisions for these tools comes from Fuchsia, here:
   # https://fuchsia.googlesource.com/integration/+/HEAD/toolchain
   # If there are problems with the toolchain, contact fuchsia-toolchain@.
-  'clang_revision': '039b969b32b64b64123dce30dd28ec4e343d893f',
+  'clang_version': 'git_revision:a93d03310e2c02fa5e24544df4706650f85788f7',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # 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': '34aa82e199ef0cba90ce026a1f3a9ad97444bdb8',
+  'dart_revision': '1d418b40d8bd82d6a2d293e8f87d37ebe43841cd',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_boringssl_gen_rev': 'ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f',
   'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
   'dart_browser_launcher_rev': '981ca8847dd2b0fe022f9e742045cfb8f214d35f',
   'dart_clock_rev': '97026d1657566bb0c9f5a33642712ec350e45084',
-  'dart_collection_rev': '414ffa1bc8ba18bd608bbf916d95715311d89ac1',
+  'dart_collection_rev': 'efd709fc1760a595f8575f4137a1847de1b49d76',
   'dart_devtools_rev': 'b21cd59f1f6bb60cacd59ba39e376d2a50d82f74',
-  'dart_protobuf_rev': '1d175bef6043bc4bdef5970f6dbd6d3001124373',
-  'dart_pub_rev': '28a2503d7f4806e6854e3ed0d783f065abfd1b5f',
+  'dart_protobuf_rev': 'ba29983968de5b54196c6c2a5cff1afbdda24ae2',
+  'dart_pub_rev': 'b9afe9270c24d040b8ae465b4b37ba4f7f4b4cc5',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
-  'dart_webdev_rev': '741695691a7a8d357e404888ebe8d3e614a84e71',
-  'dart_webkit_inspection_protocol_rev': '4e5eb8d4a48fb97603d90f2b5aac5483ebbdeb1d',
+  'dart_webdev_rev': '5343edbab54ecee37af9d18062847614b91a4bd6',
+  'dart_webkit_inspection_protocol_rev': 'b825c8f6a12200d619729903207ac826cce278da',
   'dart_yaml_edit_rev': '01589b3ce447b03aed991db49f1ec6445ad5476d',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
 
@@ -101,15 +101,19 @@ gclient_gn_args = [
 # Only these hosts are allowed for dependencies in this DEPS file.
 # If you need to add a new host, contact chrome infrastructure team.
 allowed_hosts = [
+  'boringssl.googlesource.com',
+  'chrome-infra-packages.appspot.com',
   'chromium.googlesource.com',
+  'dart.googlesource.com',
   'flutter.googlesource.com',
   'fuchsia.googlesource.com',
-  'github.com',
+  'llvm.googlesource.com',
   'skia.googlesource.com',
+  'swiftshader.googlesource.com',
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '2fd45de1f80de6b535163573463924b4be68def0',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a680bb1c63e6ae1831cb672db029e9842ec4b905',
 
    # Fuchsia compatibility
    #
@@ -127,7 +131,7 @@ deps = {
    Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',
 
   'src/third_party/libcxxabi':
-   Var('flutter_git') + '/third_party/libcxxabi' + '@' + '483f071ff4780a8884f32d97d2d262fbe9f1ae18',
+   Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
 
   'src/third_party/glfw':
    Var('fuchsia_git') + '/third_party/glfw' + '@' + '78e6a0063d27ed44c2c4805606309744f6fb29fc',
@@ -136,7 +140,7 @@ deps = {
    Var('github_git') + '/google/shaderc.git' + '@' + '948660cccfbbc303d2590c7f44a4cee40b66fdd6',
 
   'src/third_party/vulkan-deps':
-   Var('chromium_git') + '/vulkan-deps' + '@' + '23b710f1a0b3c44d51035c6400a554415f95d9c6',
+   Var('chromium_git') + '/vulkan-deps' + '@' + '9bb79e503dd5f60d14d46712d51bda9c9dd8f2d3',
 
   'src/third_party/flatbuffers':
    Var('github_git') + '/google/flatbuffers.git' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
@@ -180,7 +184,7 @@ deps = {
    Var('dart_git') + '/async.git@f3ed5f690e2ec9dbe1bfc5184705575b4f6480e5',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@9710de6c9c70b1b583183db9d9721ba64e5a16fe',
+   Var('dart_git') + '/bazel_worker.git@75a947fad63925fb441932af651819132b5ca450',
 
   'src/third_party/dart/third_party/pkg/boolean_selector':
    Var('dart_git') + '/boolean_selector.git@1d3565e2651d16566bb556955b96ea75018cbd0c',
@@ -198,7 +202,7 @@ deps = {
    Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
 
   'src/third_party/dart/third_party/pkg/convert':
-   Var('dart_git') + '/convert.git@11d191e4cc517595f53f86dd193a7c01a7601228',
+   Var('dart_git') + '/convert.git@4feeb10d2f26d22eab461469da0739a57d001edf',
 
   'src/third_party/dart/third_party/pkg/crypto':
    Var('dart_git') + '/crypto.git@7cf89d35b3d90786d9f7f75211b3b3cd7e4d173f',
@@ -207,10 +211,10 @@ deps = {
    Var('dart_git') + '/csslib.git@ba2eb2d80530eedefadaade338a09c2dd60410f3',
 
   'src/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@49bc3ff32b5578b6e19f8fd376d668130941ee29',
+   Var('dart_git') + '/dart_style.git@f79a9828ad07e50d6e8352ac154cc16eb4d78d5c',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@9908cf86dd66bce43cd4953cd1010766b01aae2b',
+   Var('dart_git') + '/dartdoc.git@3cd12f981c585f5744d169a1be2178e8ff6804e0',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@fb5f2667826c0900e551d19101052f84e35f41bf',
@@ -222,7 +226,7 @@ deps = {
    Var('dart_git') + '/fixnum.git@e0b17cc1f639c55a9c24947392c64b5a68992535',
 
   'src/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@1d51fcc172e5adfbae6e82c3f8f119774cb2fca2',
+   Var('dart_git') + '/glob.git@ee812790f4d98587a363e65d5af484ed9c6943f8',
 
   'src/third_party/dart/third_party/pkg/html':
    Var('dart_git') + '/html.git@0740fc737350959cfdb5f8a34425a29d0dc0d285',
@@ -246,7 +250,7 @@ deps = {
    Var('dart_git') + '/logging.git@f322480fb9d9e83e677c08db6d09067059f7ff74',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@e7915ed2892d31776a6ab59b5e9cc7594352274e',
+   Var('dart_git') + '/markdown.git@d72ae07c8290b3780044170eda28eda5a9fb342e',
 
   'src/third_party/dart/third_party/pkg/matcher':
    Var('dart_git') + '/matcher.git@6a9b83bbd73e50df2058b3e8e4aa301df49569c6',
@@ -276,25 +280,25 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@eadf51613e6549c30ab1132c84f6964a2a6bfa5c',
+   Var('dart_git') + '/pub_semver.git@28159b8c5b96fc2709d0904389d7932880f68659',
 
   'src/third_party/dart/third_party/pkg/shelf':
    Var('dart_git') + '/shelf.git@39d820d4e32fc99c65f562786097487d597dcee1',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
-   Var('dart_git') + '/source_map_stack_trace.git@72dbf21a33293b2b8434d0a9751e36f9463981ac',
+   Var('dart_git') + '/source_map_stack_trace.git@8d8078fcc81c8f7936805cd277198493e0b7fc62',
 
   'src/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@e93565b43a7b6b367789de8ffba969c4ebeeb317',
+   Var('dart_git') + '/source_maps.git@c7e89635a7651974feb78e3ce272fac5aa3f4334',
 
   'src/third_party/dart/third_party/pkg/source_span':
    Var('dart_git') + '/source_span.git@ff03af16474ce91c89eb3bc28182866f4cb6dfb0',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@00084c43684ddaf7e09c19c5364c4a27eb04efda',
+   Var('dart_git') + '/sse.git@283568dd4865cc51e25370ed107fcbdb68759c22',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@17f09c2c6845bb31c7c385acecce5befb8527a13',
+   Var('dart_git') + '/stack_trace.git@dce00134f6558086e8963e37d0b1ba0830862c01',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
    Var('dart_git') + '/stream_channel.git@a5129ca44322a7024074ca38fb98e343dcb638c7',
@@ -306,7 +310,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@ec7cf7bb51ebb7d55760a1359f6697690dbc06ba',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@58beb14cf1562429d411efa8926d7c61d0d0b133',
+   Var('dart_git') + '/test.git@f704d5afe9667ee1cc35b8575822629091fd6441',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@ef934b7a894d78601ba67d8f6207bd4505690456',
@@ -448,7 +452,7 @@ deps = {
    Var('flutter_git') + '/third_party/inja' + '@' + '88bd6112575a80d004e551c98cf956f88ff4d445',
 
   'src/third_party/libtess2':
-   Var('flutter_git') + '/third_party/libtess2' + '@' + 'fc52516467dfa124bdd967c15c7cf9faf02a34ca',
+   Var('flutter_git') + '/third_party/libtess2' + '@' + '725e5e08ec8751477565f1d603fd7eb9058c277c',
 
   'src/third_party/sqlite':
    Var('flutter_git') + '/third_party/sqlite' + '@' + '0f61bd2023ba94423b4e4c8cfb1a23de1fe6a21c',
@@ -481,7 +485,7 @@ deps = {
   Var('github_git') + '/felangel/equatable.git' + '@' + '0ba67c72db8bed75877fc1caafa74112ee0bd921', # 2.0.2
 
   'src/third_party/pkg/file':
-  Var('github_git') + '/google/file.dart.git' + '@' + 'b2e31cb6ef40b223701dbfa0b907fe58468484d7', # 6.1.4
+  Var('dart_git') + '/external/github.com/google/file.dart.git' + '@' + 'b2e31cb6ef40b223701dbfa0b907fe58468484d7', # 6.1.4
 
   'src/third_party/pkg/flutter_packages':
   Var('github_git') + '/flutter/packages.git' + '@' + '26990a2f75ab2028c3c77ffc869db11d6d866d18', # various
@@ -505,7 +509,7 @@ deps = {
   Var('github_git') + '/google/quiver-dart.git' + '@' + '66f473cca1332496e34a783ba4527b04388fd561', # 2.1.5
 
   'src/third_party/pkg/vector_math':
-  Var('github_git') + '/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
+  Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
 
   'src/third_party/imgui':
   Var('github_git') + '/ocornut/imgui.git' + '@' + '29d462ebce0275345a6ce4621d8fff0ded57c9e5',
@@ -619,7 +623,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/mac-amd64',
-        'version': 'git_revision:' + Var('clang_revision'),
+        'version': Var('clang_version'),
       }
     ],
     'condition': 'host_os == "mac"', # On ARM64 Macs too because Goma doesn't support the host-arm64 toolchain.
@@ -630,7 +634,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/mac-arm64',
-        'version': 'git_revision:' + Var('clang_revision'),
+        'version': Var('clang_version'),
       }
     ],
     'condition': 'host_os == "mac" and host_cpu == "arm64"',
@@ -641,7 +645,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-amd64',
-        'version': 'git_revision:' + Var('clang_revision'),
+        'version': Var('clang_version'),
       }
     ],
     'condition': 'host_os == "linux" and host_cpu == "x64"',
@@ -652,7 +656,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-arm64',
-        'version': 'git_revision:' + Var('clang_revision'),
+        'version': Var('clang_version'),
       }
     ],
     'condition': 'host_os == "linux" and host_cpu == "arm64"',
@@ -663,7 +667,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/windows-amd64',
-        'version': 'git_revision:' + Var('clang_revision'),
+        'version': Var('clang_version'),
       }
     ],
     'condition': 'download_windows_deps',
@@ -677,7 +681,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'GBHNBHS7nctZyhNIlnL1pPGdBLAtAzTc7hgmtkN7nmQC'
+        'version': 'fcFu9Z2KJH6oQvHnGwRsngQjHowI9mBvGX6akXTduzEC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -687,7 +691,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'gcHdDsKmQTV_IVNjvMQxyRK0m1Xce2182BPd5NA1B2wC'
+        'version': 'NqPnoRHl3WYqH3SrC-klcyyoJSPBDSZFYsl0Bas04c0C'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

build/archives/BUILD.gn

@@ -220,13 +220,6 @@ if (build_engine_artifacts && !flutter_prebuilt_dart_sdk) {
   }
 }
 
-# Archives Flutter Web SDK
-if (!is_fuchsia) {
-  group("flutter_web_sdk") {
-    deps = [ "//flutter/web_sdk:flutter_web_sdk_archive" ]
-  }
-}
-
 # Archives Flutter Windows Artifacts
 if (host_os == "win") {
   zip_bundle("windows_flutter") {