Merge branch 'main' into BackdropViewPreRebase

Fixing rebase diff

Author: emilyabest

.ci.yaml

@@ -118,7 +118,7 @@ targets:
       - DEPS
       - .ci.yaml
       - testing/**
-      - shell/platforms/android/**
+      - shell/platform/android/**
 
   - name: Linux Benchmarks
     enabled_branches:
@@ -294,6 +294,14 @@ targets:
       jazzy_version: "0.14.1"
     timeout: 75
 
+  - name: Mac mac_android_aot_engine
+    recipe: engine_v2/engine_v2
+    bringup: true
+    timeout: 60
+    properties:
+      config_name: mac_android_aot_engine
+      environment: Staging
+
   - name: Mac mac_host_engine
     recipe: engine_v2/engine_v2
     bringup: true

.github/workflows/scorecards-analysis.yml

@@ -26,7 +26,7 @@ jobs:
           persist-credentials: false
 
       - name: setup python
-        uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
+        uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5
         with:
           python-version: '3.7.7' # install the python version needed
 
@@ -57,6 +57,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@3e7e3b32d0fb8283594bb0a76cc60a00918b0969
+        uses: github/codeql-action/upload-sarif@2ca79b6fa8d3ec278944088b4aa5f46912db5d63
         with:
           sarif_file: results.sarif

BUILD.gn

@@ -126,6 +126,7 @@ group("flutter") {
   if (enable_unittests && !is_win && !is_fuchsia) {
     public_deps += [
       "//flutter/display_list:display_list_benchmarks",
+      "//flutter/display_list:display_list_builder_benchmarks",
       "//flutter/fml:fml_benchmarks",
       "//flutter/lib/ui:ui_benchmarks",
       "//flutter/shell/common:shell_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': 'b676a02b01727ba6453ae40c7e9ac5201785aba4',
+  'skia_revision': '3901abed003450c20001e6b7538408e484ed7aa9',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -36,7 +36,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': '9682f26ed47787abd7942eeca1a8f76f713c6b7f',
+  'dart_revision': '36c21217228c78dc1e0f2d1eb2d1c3df376698ec',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -45,12 +45,12 @@ vars = {
   'dart_browser_launcher_rev': '981ca8847dd2b0fe022f9e742045cfb8f214d35f',
   'dart_clock_rev': '2507a228773c5e877fc9e3330080b234aad965c0',
   'dart_collection_rev': '414ffa1bc8ba18bd608bbf916d95715311d89ac1',
-  'dart_devtools_rev': '95d292626da26505b02417735f77e8922783b477',
-  'dart_protobuf_rev': 'a840335449e6a2a9617d2ebe5ecd0d577e071248',
-  'dart_pub_rev': '9bf4289d6fd5d6872a8929d6312bbd7098f3ea9c',
+  'dart_devtools_rev': 'd131d19091f6b89ac89486bd92440a25a523e8b0',
+  'dart_protobuf_rev': '6f5360ba1d6c4605049fa3574357dab7c8d38400',
+  'dart_pub_rev': 'ac7db6c07318efa4a8712110275eaf70f96a6d00',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': 'e00c0ea769e32821d91c0880da8eb736839a6e6d',
-  'dart_webdev_rev': '27cc5c9228ca59e721bc41fe7028e0fd6b995748',
+  'dart_webdev_rev': '490d6a06f7ed75654bcfd5a0e8351f8a0f59df1c',
   'dart_webkit_inspection_protocol_rev': '57522d6b29d94903b765c757079d906555d5a171',
   'dart_yaml_edit_rev': '01589b3ce447b03aed991db49f1ec6445ad5476d',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
@@ -102,7 +102,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'cd444824e34d8f735a351f680776bc0479f20677',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '0881a07a2203d23e21712cc5829ec5469ae19e3d',
 
    # Fuchsia compatibility
    #
@@ -164,10 +164,10 @@ deps = {
   # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
 
   'src/third_party/dart/third_party/devtools':
-   {'packages': [{'version': 'git_revision:95d292626da26505b02417735f77e8922783b477', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'git_revision:d131d19091f6b89ac89486bd92440a25a523e8b0', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
 
   'src/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@73e8d3b55cbedc9765f8e266f3422d8914f8e62a',
+   Var('dart_git') + '/args.git@80d4abbd6b38b79bcdbc411b4b517628c7611232',
 
   'src/third_party/dart/third_party/pkg/async':
    Var('dart_git') + '/async.git@f3ed5f690e2ec9dbe1bfc5184705575b4f6480e5',
@@ -200,10 +200,10 @@ deps = {
    Var('dart_git') + '/csslib.git@ba2eb2d80530eedefadaade338a09c2dd60410f3',
 
   'src/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@d7b73536a8079331c888b7da539b80e6825270ea',
+   Var('dart_git') + '/dart_style.git@49bc3ff32b5578b6e19f8fd376d668130941ee29',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@d3b0b724972ffcc70a47c35a31051af2c3ca012d',
+   Var('dart_git') + '/dartdoc.git@8ee30225e2d89d6044dc48965c9ce1ec1c406cb9',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@18b2b549d55009ff594600b04705ff6161681e07',
@@ -221,19 +221,19 @@ deps = {
    Var('dart_git') + '/html.git@8243e967caad9932c13971af3b2a7c8f028383d5',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@5055b684ae45fb141a106ef6ced988aa37ed0ea6',
+   Var('dart_git') + '/http.git@45f91f23847d51df53bb704bd25a7f64fb117081',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@20bf079c8955d1250a45afb9cb096472a724a551',
 
   'src/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@d25b3c9e7f23e31ac388a03361737110768597f6',
+   Var('dart_git') + '/http_parser.git@b968f7ddde0588273a6cbd1d2eb6569f418606ac',
 
   'src/third_party/dart/third_party/pkg/json_rpc_2':
    Var('dart_git') + '/json_rpc_2.git@805e6536dd961d66f6b8cd46d8f3e61774f957c9',
 
   'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@b4afc10055f3009478da1eac1827f9fef42c3759',
+   Var('dart_git') + '/linter.git@a97919a064cc4b3b6923a18cdb47a3779a31bc7b',
 
   'src/third_party/dart/third_party/pkg/logging':
    Var('dart_git') + '/logging.git@d10e24844c2e01d3f6d2b5a1a2bb8717359c6a87',
@@ -248,7 +248,7 @@ deps = {
    Var('dart_git') + '/mime.git@0a75a41445eb642674a0a271eecde78cb025ee60',
 
   'src/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@d8a2ddd2054390bd03d34bf64c940884e6f7a596',
+   Var('dart_git') + '/mockito.git@2acf22f4d400c6e1eee0f6ca595092220fba8b34',
 
   'src/third_party/dart/third_party/pkg/oauth2':
    Var('dart_git') + '/oauth2.git@199ebf15cbd5b07958438184f32e41c4447a57bf',
@@ -269,10 +269,10 @@ 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@5c0b4bfd5ca57fe16f1319c581dc8c882e9b8cb2',
+   Var('dart_git') + '/pub_semver.git@9fd28757ba45961ac5449e0f2b0020670e921475',
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@0371a64bd3b99044ee3158bacf8813bba735a9c7',
+   Var('dart_git') + '/shelf.git@0965d864d0e6c66d5bb6daece400e80484640bd5',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@72dbf21a33293b2b8434d0a9751e36f9463981ac',
@@ -299,13 +299,13 @@ deps = {
    Var('dart_git') + '/term_glyph.git@ec7cf7bb51ebb7d55760a1359f6697690dbc06ba',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@b144a336776eaa1f9420f3ab38214d8c061c663e',
+   Var('dart_git') + '/test.git@aba7de5851ace64f1f887369ae9424582d9d4d7f',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@8d0de01bbe852fea1f8e33aba907abcba50a8a1e',
 
   'src/third_party/dart/third_party/pkg/typed_data':
-   Var('dart_git') + '/typed_data.git@bb10b64f9a56b8fb49307d4465474bf1c1309f6d',
+   Var('dart_git') + '/typed_data.git@6369490ede1c87a4a5758304a606a6e4eee364b9',
 
   'src/third_party/dart/third_party/pkg/usage':
    Var('dart_git') + '/usage.git@e287a72228974886d8a3b40ddcdf12f69d7c6a22',
@@ -464,7 +464,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
 
    'src/third_party/abseil-cpp':
-   Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + 'f92f9effc89af7692436c3b9fbb3a67f2239d893',
+   Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + '61833f2c057a2b1993d871e8c51156aed1dd4354',
 
    # Dart packages
   'src/third_party/pkg/archive':
@@ -606,29 +606,51 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/mac-amd64',
-        'version': 'NyopqdQvXY11sckCZIz7FdXLgQZep1ssg1IYBX09ZPwC'
+        'version': 'git_revision:d9e02a30b16ea65a7da87913c40af03e22c9571f'
       }
     ],
     'condition': 'host_os == "mac"',
     'dep_type': 'cipd',
   },
 
+  'src/buildtools/mac-arm64/clang': {
+    'packages': [
+      {
+        'package': 'fuchsia/third_party/clang/mac-arm64',
+        'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855'
+      }
+    ],
+    'condition': 'host_os == "mac" and host_cpu == "arm64"',
+    'dep_type': 'cipd',
+  },
+
   'src/buildtools/linux-x64/clang': {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-amd64',
-        'version': 'ad2NsyQv7Q0UnDFu6vxeKVumfP-AHmA-ju9u0YCZkwgC'
+        'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855'
+      }
+    ],
+    'condition': 'host_os == "linux" and host_cpu == "x64"',
+    'dep_type': 'cipd',
+  },
+
+  'src/buildtools/linux-arm64/clang': {
+    'packages': [
+      {
+        'package': 'fuchsia/third_party/clang/linux-amd64',
+        'version': 'git_revision:d9e02a30b16ea65a7da87913c40af03e22c9571f'
       }
     ],
-    'condition': 'host_os == "linux"',
+    'condition': 'host_os == "linux" and host_cpu == "arm64"',
     'dep_type': 'cipd',
   },
 
   'src/buildtools/windows-x64/clang': {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/windows-amd64',
-        'version': '4H1CWy95NO6tWA96OvQIMCA-s9tZfSMLa9RoghEuXqgC'
+        'version': 'git_revision:d9e02a30b16ea65a7da87913c40af03e22c9571f'
       }
     ],
     'condition': 'download_windows_deps',
@@ -642,7 +664,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': '4a7EGv8XgmVJaXcLDEAbnJemYdTscS_D9519rLXQCE8C'
+        'version': 'QWFPHejM3XUHdRt0mm8agNq7weRw5hSVM4AEoJhrWgEC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -652,7 +674,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'iK5Vt2rn1yhQPaopdd33HrHWlBLC4Sl0B76E8DtmU9wC'
+        'version': 'OkIFye3iRfA9DknTFPlAZ-xJdNubmiaj1DOQgJqxRPAC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',