[CP] [Android] Synchronize incorrect metaState using post-synchronization

.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@f5d217be74900c6ac8fbbe53f3c10376ba4e64da
         with:
           sarif_file: results.sarif

BUILD.gn

@@ -84,9 +84,13 @@ group("flutter") {
       "//flutter/examples/glfw",
       "//flutter/examples/vulkan_glfw",
     ]
+
+    if (!is_mac) {
+      public_deps += [ "//flutter/examples/glfw_drm" ]
+    }
   }
 
-  # If enbaled, compile the SDK / snapshot.
+  # If enabled, compile the SDK / snapshot.
   if (!is_fuchsia) {
     public_deps += [ "//flutter/lib/snapshot:generate_snapshot_bins" ]
 
@@ -100,6 +104,9 @@ group("flutter") {
         # gen_snapshot for the host and not the target.
         "//third_party/dart/runtime/bin:gen_snapshot",
 
+        # Built alongside gen_snapshot for 64 bit targets
+        "//third_party/dart/runtime/bin:analyze_snapshot",
+
         # Impeller artifacts - compiler and libtessellator
         "//flutter/impeller/compiler:impellerc",
         "//flutter/impeller/tessellator:tessellator_shared",

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': '3a6550ab89657cbe4c977589cc8c03fe7aad65cc',
+  'skia_revision': 'dee2a6ebfcdfff981b8b0a520c23220ab5673089',
 
   # 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': '03c6091964b59b587e0cfa5ee822a1aa5947b8b8',
+  'dart_revision': '268aa39b1999072555e094059295c5a212152c27',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -46,12 +46,12 @@ vars = {
   'dart_clock_rev': '2507a228773c5e877fc9e3330080b234aad965c0',
   'dart_collection_rev': '414ffa1bc8ba18bd608bbf916d95715311d89ac1',
   'dart_devtools_rev': 'd131d19091f6b89ac89486bd92440a25a523e8b0',
-  'dart_protobuf_rev': '9aad6aadcc0fc616051c7e0eaef78c26b3dd7b60',
-  'dart_pub_rev': '9bf4289d6fd5d6872a8929d6312bbd7098f3ea9c',
+  'dart_protobuf_rev': '8337a7910fef805214e5aae35a98abd481d87a18',
+  'dart_pub_rev': 'ac7db6c07318efa4a8712110275eaf70f96a6d00',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': 'e00c0ea769e32821d91c0880da8eb736839a6e6d',
-  'dart_webdev_rev': '27cc5c9228ca59e721bc41fe7028e0fd6b995748',
-  'dart_webkit_inspection_protocol_rev': '57522d6b29d94903b765c757079d906555d5a171',
+  'dart_webdev_rev': 'a82a5a900e54584c53cdc0853e6ecf952f5c1d72',
+  'dart_webkit_inspection_protocol_rev': '57ebca4b97310a10774c59c0fb056d8f23bd5cee',
   'dart_yaml_edit_rev': '01589b3ce447b03aed991db49f1ec6445ad5476d',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
 
@@ -61,7 +61,7 @@ vars = {
   'download_dart_sdk': True,
 
   # Checkout Android dependencies only on platforms where we build for Android targets.
-  'download_android_deps': 'host_os == "mac" or host_os == "linux"',
+  'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")',
 
   # Checkout Windows dependencies only if we are building on Windows.
   'download_windows_deps' : 'host_os == "win"',
@@ -102,7 +102,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'cd444824e34d8f735a351f680776bc0479f20677',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '25e5fd0200ff0bbf4761f3e73cab67a16e928955',
 
    # Fuchsia compatibility
    #
@@ -167,7 +167,7 @@ deps = {
    {'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',
@@ -194,22 +194,22 @@ deps = {
    Var('dart_git') + '/convert.git@7145da14f9cd730e80fb4c6a10108fcfd205e8e7',
 
   'src/third_party/dart/third_party/pkg/crypto':
-   Var('dart_git') + '/crypto.git@223e0a62c0f762fd2b510f753861445b52e14fc3',
+   Var('dart_git') + '/crypto.git@7cf89d35b3d90786d9f7f75211b3b3cd7e4d173f',
 
   'src/third_party/dart/third_party/pkg/csslib':
    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@d7513b2ee0a9bad6c9526f6b0ba970b4fcca17d0',
+   Var('dart_git') + '/dartdoc.git@b3d4aa002d36c28b0af114abd0997b8521c27b11',
 
   'src/third_party/dart/third_party/pkg/ffi':
-   Var('dart_git') + '/ffi.git@18b2b549d55009ff594600b04705ff6161681e07',
+   Var('dart_git') + '/ffi.git@fb5f2667826c0900e551d19101052f84e35f41bf',
 
   'src/third_party/dart/third_party/pkg/file':
-   Var('dart_git') + '/external/github.com/google/file.dart@0132eeedea2933513bf230513a766a8baeab0c4f',
+   Var('dart_git') + '/external/github.com/google/file.dart@b2e31cb6ef40b223701dbfa0b907fe58468484d7',
 
   'src/third_party/dart/third_party/pkg/fixnum':
    Var('dart_git') + '/fixnum.git@e0b17cc1f639c55a9c24947392c64b5a68992535',
@@ -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@b0585323f586d56359a8329cc532ad0ee7cbee91',
 
   '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@304042aaa933a02d2581ab9598dd2ddaebdbc803',
 
   '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@5f52c524cd10ba3dd9aa5614955c338d50b29d21',
 
   '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',
@@ -314,7 +314,7 @@ deps = {
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
 
   'src/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@99dbdc5769e19b9eeaf69449a59079153c6a8b1f',
+   Var('dart_git') + '/web_socket_channel.git@4b46c0c4196a5e76c2b0e2589ed37de247d35938',
 
   'src/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -329,7 +329,7 @@ deps = {
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.18.0-271.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.18.0-271.7.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -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':
@@ -474,7 +474,7 @@ deps = {
   Var('github_git') + '/felangel/equatable.git' + '@' + '0ba67c72db8bed75877fc1caafa74112ee0bd921', # 2.0.2
 
   'src/third_party/pkg/file':
-  Var('github_git') + '/google/file.dart.git' + '@' + '427bb20ccc852425d67f2880da2a9b4707c266b4', # 6.1.0
+  Var('github_git') + '/google/file.dart.git' + '@' + 'b2e31cb6ef40b223701dbfa0b907fe58468484d7', # 6.1.4
 
   'src/third_party/pkg/flutter_packages':
   Var('github_git') + '/flutter/packages.git' + '@' + '26990a2f75ab2028c3c77ffc869db11d6d866d18', # various
@@ -546,7 +546,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/android/sdk/all/${{platform}}',
-        'version': 'version:32v1'
+        'version': 'version:33v6'
        }
      ],
      'condition': 'download_android_deps',
@@ -606,7 +606,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/mac-amd64',
-        'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855'
+        'version': 'git_revision:60d276923902051192eba692e5312e605c9d9f65'
       }
     ],
     'condition': 'host_os == "mac"',
@@ -628,7 +628,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-amd64',
-        'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855'
+        'version': 'git_revision:41d4067d0b7c3c955b8b6cda328bcb46e268bd6a'
       }
     ],
     'condition': 'host_os == "linux" and host_cpu == "x64"',
@@ -638,8 +638,8 @@ deps = {
   'src/buildtools/linux-arm64/clang': {
     'packages': [
       {
-        'package': 'fuchsia/third_party/clang/linux-amd64',
-        'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855'
+        'package': 'fuchsia/third_party/clang/linux-arm64',
+        'version': 'git_revision:d9e02a30b16ea65a7da87913c40af03e22c9571f'
       }
     ],
     'condition': 'host_os == "linux" and host_cpu == "arm64"',
@@ -650,7 +650,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/windows-amd64',
-        'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855'
+        'version': 'git_revision:41d4067d0b7c3c955b8b6cda328bcb46e268bd6a'
       }
     ],
     'condition': 'download_windows_deps',
@@ -664,7 +664,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'YeMyxhFzoCNrwt0GrUkvlLgP9N_gYEy8dQ6B0Stvp5YC'
+        'version': 'Dze6-JhF8LT-exmW_FbhtaUl_QFTlUnQHvtopxkj2H8C'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -674,7 +674,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '13FsbGdE97bnZF8KOg3CT33qNvj481lj3Ke4vN4kRMEC'
+        'version': '8N2zrCMhImBEPCtuCFCohtRIJRw1UxWRKIee5kvj5JMC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

analysis_options.yaml

@@ -5,29 +5,18 @@
 # "DIFFERENT FROM FLUTTER/FLUTTER" below.
 
 analyzer:
-  exclude:
-    # Fixture depends on dart:ui and raises false positives.
-    - flutter_frontend_server/test/fixtures/lib/main.dart
   language:
     strict-casts: true
     strict-raw-types: true
   errors:
-    # treat missing required parameters as a warning (not a hint)
-    missing_required_param: warning
-    # treat missing returns as a warning (not a hint)
-    missing_return: warning
-    native_function_body_in_non_sdk_code: ignore # DIFFERENT FROM FLUTTER/FLUTTER
-    # allow having TODO comments in the code
-    todo: ignore
-    # allow dart:ui to import dart:_internal
-    import_internal_library: ignore # DIFFERENT FROM FLUTTER/FLUTTER
     # allow self-reference to deprecated members (we do this because otherwise we have
     # to annotate every member in every test, assert, etc, when we deprecate something)
     deprecated_member_use_from_same_package: ignore
     # Turned off until null-safe rollout is complete.
     unnecessary_null_comparison: ignore
-    # TODO(goderbauer): remove when https://github.com/dart-lang/sdk/issues/49563 is fixed.
-    ffi_native_unexpected_number_of_parameters: ignore # DIFFERENT FROM FLUTTER/FLUTTER
+  exclude: # DIFFERENT FROM FLUTTER/FLUTTER
+    # Fixture depends on dart:ui and raises false positives.
+    - flutter_frontend_server/test/fixtures/lib/main.dart
 
 linter:
   rules:
@@ -65,7 +54,7 @@ linter:
     - avoid_relative_lib_imports
     - avoid_renaming_method_parameters
     - avoid_return_types_on_setters
-    # - avoid_returning_null # still violated by some pre-nnbd code that we haven't yet migrated
+    - avoid_returning_null
     - avoid_returning_null_for_future
     - avoid_returning_null_for_void
     # - avoid_returning_this # there are enough valid reasons to return `this` that this lint ends up with too many false positives
@@ -89,7 +78,7 @@ linter:
     # - close_sinks # not reliable enough
     - combinators_ordering
     # - comment_references # blocked on https://github.com/dart-lang/linter/issues/1142
-    # - conditional_uri_does_not_exist # not yet tested
+    - conditional_uri_does_not_exist
     # - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
     - control_flow_in_finally
     - curly_braces_in_flow_control_structures
@@ -151,7 +140,7 @@ linter:
     # - prefer_double_quotes # opposite of prefer_single_quotes
     - prefer_equal_for_default_values
     # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
-    # - prefer_final_fields # DIFFERENT FROM FLUTTER/FLUTTER (we do weird things with private fields, especially on the PlatformDispatcher object)
+    - prefer_final_fields
     - prefer_final_in_for_each
     - prefer_final_locals
     # - prefer_final_parameters # we should enable this one day when it can be auto-fixed (https://github.com/dart-lang/linter/issues/3104), see also parameter_assignments
@@ -186,7 +175,7 @@ linter:
     # - sized_box_shrink_expand # not yet tested
     - slash_for_doc_comments
     - sort_child_properties_last
-    # - sort_constructors_first # DIFFERENT FROM FLUTTER/FLUTTER (we have private fake constructors)
+    - sort_constructors_first
     # - sort_pub_dependencies # prevents separating pinned transitive dependencies
     - sort_unnamed_constructors_first
     - test_types_in_equals