Merge branch 'main' into engine-cleanup-run-android-jni-windows

Author: matanlurey

.ci.yaml

@@ -53,7 +53,7 @@ platform_properties:
         ]
       device_type: none
       cpu: x86
-      os: Mac-12
+      os: Mac-12|Mac-13
       # TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
       $flutter/osx_sdk : >-
         {
@@ -88,11 +88,14 @@ targets:
   - name: Linux linux_android_emulator_tests
     enabled_branches:
       - main
-    recipe: engine_v2/builder
-    presubmit: false
+    recipe: engine_v2/engine_v2
     properties:
       config_name: linux_android_emulator
     timeout: 60
+    runIf:
+      - .ci.yaml
+      - lib/ui/**
+      - shell/platform/android/**
 
   - name: Linux builder_cache
     enabled_branches:
@@ -161,6 +164,25 @@ targets:
       config_name: linux_benchmarks
     timeout: 60
 
+  - name: Linux Fuchsia
+    bringup: true
+    recipe: engine/engine
+    properties:
+      build_fuchsia: "true"
+      fuchsia_ctl_version: version:0.0.27
+      # ensure files from pre-production Fuchsia SDK tests are purged from cache
+      clobber: "true"
+    timeout: 90
+    # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
+    # runIfNot:
+    #   - lib/web_ui/**
+    #   - shell/platform/android/**
+    #   - shell/platform/darwin/**
+    #   - shell/platform/glfw/**
+    #   - shell/platform/linux/**
+    #   - shell/platform/windows/**
+    #   - web_sdk/**
+
   - name: Linux Fuchsia FEMU
     recipe: engine/femu_test
     properties:
@@ -172,14 +194,15 @@ targets:
       emulator_arch: "x64"
       enable_cso: "true"
     timeout: 60
-    runIfNot:
-      - lib/web_ui/**
-      - shell/platform/android/**
-      - shell/platform/darwin/**
-      - shell/platform/glfw/**
-      - shell/platform/linux/**
-      - shell/platform/windows/**
-      - web_sdk/**
+    # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
+    # runIfNot:
+    #   - lib/web_ui/**
+    #   - shell/platform/android/**
+    #   - shell/platform/darwin/**
+    #   - shell/platform/glfw/**
+    #   - shell/platform/linux/**
+    #   - shell/platform/windows/**
+    #   - web_sdk/**
 
   - name: Linux Fuchsia arm64 FEMU
     recipe: engine/femu_test
@@ -192,14 +215,15 @@ targets:
       enable_cso: "true"
     timeout: 60
     bringup: true
-    runIfNot:
-      - lib/web_ui/**
-      - shell/platform/android/**
-      - shell/platform/darwin/**
-      - shell/platform/glfw/**
-      - shell/platform/linux/**
-      - shell/platform/windows/**
-      - web_sdk/**
+    # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
+    # runIfNot:
+    #   - lib/web_ui/**
+    #   - shell/platform/android/**
+    #   - shell/platform/darwin/**
+    #   - shell/platform/glfw/**
+    #   - shell/platform/linux/**
+    #   - shell/platform/windows/**
+    #   - web_sdk/**
 
   - name: Linux linux_fuchsia
     recipe: engine_v2/engine_v2
@@ -209,14 +233,15 @@ targets:
       config_name: linux_fuchsia
     drone_dimensions:
       - os=Linux
-    runIfNot:
-      - lib/web_ui/**
-      - shell/platform/android/**
-      - shell/platform/darwin/**
-      - shell/platform/glfw/**
-      - shell/platform/linux/**
-      - shell/platform/windows/**
-      - web_sdk/**
+    # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
+    # runIfNot:
+    #   - lib/web_ui/**
+    #   - shell/platform/android/**
+    #   - shell/platform/darwin/**
+    #   - shell/platform/glfw/**
+    #   - shell/platform/linux/**
+    #   - shell/platform/windows/**
+    #   - web_sdk/**
 
   - name: Linux Framework Smoke Tests
     recipe: engine/framework_smoke
@@ -440,7 +465,7 @@ targets:
           "toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
         }
     drone_dimensions:
-      - os=Mac-12
+      - os=Mac-12|Mac-13
 
   - name: Linux mac_unopt
     recipe: engine_v2/engine_v2
@@ -464,7 +489,7 @@ targets:
           "toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
         }
     drone_dimensions:
-      - os=Mac-12
+      - os=Mac-12|Mac-13
       - cpu=x86
 
   - name: Mac impeller-cmake-example

.clang-tidy

@@ -45,10 +45,19 @@ CheckOptions:
   - key: readability-identifier-naming.PrivateMemberSuffix
     value: "_"
 
-# Lint headers within paths that contain "/flutter/" but not:
-# - gen         (generated code, the fact it compiles is good enough™)
-# - third_party (we didn't author most of the code, and can't fix the lints)
+# Intended to include (lint) all headers except:
+# ... those in ../../gen (generated files don't need to follow clang tidy)
+# ... those in flutter/third_party (we didn't author this code, it's a dep)
 #
-# Note this is because of our buildroot setup, so the full path of a lint is:
-# "../../flutter/impeller/core/runtime_types.h:1:1" as reported.
-HeaderFilterRegex: "(!third_party/)(!gen/).*/flutter/.*"
+# Unfortunately Clang Tidy uses an ancient version of regular expressions
+# without lookaheads, so the next best thing is to write out every directory
+# except third_party.
+#
+# If we ever add a new root directory, we'll have to update this expression.
+#
+# See the test in ./tools/clang_tidy/test/header_filter_regex_test.dart which
+# should theoretically catch if new directories are added but this regex is not
+# updated.
+#
+# tl;dr: I'm sorry.
+HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|vulkan|wasm|web_sdk)\/.*"

BUILD.gn

@@ -125,6 +125,7 @@ group("flutter") {
       "//flutter/display_list:display_list_builder_benchmarks",
       "//flutter/display_list:display_list_region_benchmarks",
       "//flutter/fml:fml_benchmarks",
+      "//flutter/impeller/aiks:canvas_benchmarks",
       "//flutter/impeller/geometry:geometry_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': '5d6bdbf69dea844b24af2c6947bf74ddcc0627e3',
+  'skia_revision': '540d76ea74f84473839fdebe0fb3ca4a55d8c6dd',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -59,7 +59,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': '65819963fb174f8732005b2234a24bc06758b8ea',
+  'dart_revision': '67f7a2c2559a97c1125a56381e74ab3a46925535',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -68,17 +68,17 @@ vars = {
   'dart_boringssl_rev': '74646566e93de7551bfdfc5f49de7462f13d1d05',
   'dart_browser_launcher_rev': 'f60df1d9b1f7b90e4eaeedccc3952fdd6ffba28a',
   'dart_clock_rev': 'f975668839f45bad561d6227f88297bbbcff03fa',
-  'dart_collection_rev': 'f309148623c4755ce9d6c00850092458325058ca',
-  'dart_devtools_rev': 'fec80c6e29b627aa17e8b15f72cb4013a28d14ec',
+  'dart_collection_rev': '2d57a82ad079fe2d127f5a9b188170de2f5cdedc',
+  'dart_devtools_rev': '27795d615e1878ccf5f55c4b90d611e2628a8618',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'dcec2eda9db4e6728e900928aa2e46944ba4fa6f',
-  'dart_pub_rev': 'fca927ae2662204805e1646c0c0687369001a41a',
+  'dart_pub_rev': '1779628b386819675130f14326f1e8812901c48f',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
-  'dart_tools_rev': '2e36b8d326e95ed256a74ee2ebdcfff5be502c57',
-  'dart_watcher_rev': 'b2b278ae4198b4c431a145ddcfdab1460d5f9ec5',
-  'dart_webdev_rev': '6961b202c343e12893e6c664ef70336b7c3845c3',
+  'dart_tools_rev': 'c63dcb5e93d4a222da0c52960bb6688030ddabc3',
+  'dart_watcher_rev': 'dc45f1925f66743ff29b9dcbb4693a7ec25945c5',
+  'dart_webdev_rev': '63e09e5060813a971ec0f95472613d6958f75b95',
   'dart_webkit_inspection_protocol_rev': '667c55e6f65638592768e0325b75420e39b01d2e',
   'dart_yaml_edit_rev': '9b9d33c5255798c950e843efe19e6f81a225ad28',
   'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -285,7 +285,7 @@ deps = {
    Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',
 
   'src/flutter/third_party/shaderc':
-   Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '7ea834ecc59258a5c13c3d3e6fa0582bdde7c543',
+   Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',
 
   'src/third_party/vulkan-deps':
    Var('chromium_git') + '/vulkan-deps' + '@' + '40b75117a60b11c42a1fb87bf14c0f49bcdb8b3d',
@@ -303,7 +303,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',
 
   'src/third_party/googletest':
-   Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '054a986a8513149e8374fc669a5fe40117ca6b41',
+   Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
 
   'src/third_party/boringssl':
    Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
@@ -333,7 +333,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@a51bd6df919a5b79574f0996a760cc20cb05697e',
 
   'src/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:fec80c6e29b627aa17e8b15f72cb4013a28d14ec'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:27795d615e1878ccf5f55c4b90d611e2628a8618'}]},
 
   'src/third_party/dart/third_party/pkg/args':
    Var('dart_git') + '/args.git@46d5033377d277d70bc6ec68504730b9384b1db1',
@@ -369,7 +369,7 @@ deps = {
    Var('dart_git') + '/csslib.git@17346e528b19c09b2d20589e0ffa0f01a5ad54ad',
 
   'src/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@2cee560f2025f8bd5dce3fd5f4c4b5cf5335a10b',
+   Var('dart_git') + '/dart_style.git@8b1f24a8475a0116757172cd9acca4acbf87d973',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
    Var('dart_git') + '/dartdoc.git@53da3e1dd1802c5899352fce251ea0c385a827b0',
@@ -414,16 +414,16 @@ deps = {
    Var('dart_git') + '/markdown.git@3774ad02e812ceeb32ad0d98a987b0acffa63cf6',
 
   'src/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@3d03fa1a3e8f166b9e2ec8557c5d5e83ae1c85bc',
+   Var('dart_git') + '/matcher.git@fcbd3616c1dbe636d22d2b164aee3f1c32c52a42',
 
   'src/third_party/dart/third_party/pkg/mime':
    Var('dart_git') + '/mime.git@8ebf9463a7a230213cee0adc3c019dad78d364ac',
 
   'src/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@fcb9779f8e8a15b2ca1757611b3e32a84e24c7ed',
+   Var('dart_git') + '/mockito.git@fb8a2b5731553f5ed22107e1a0f7af8918d28442',
 
   'src/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@eaea725b0939815e7d007a34808a7293b179a2ad',
+   Var('dart_git') + '/native.git@5aeab2915167fd24ccb1241c07516b388fda2b9b',
 
   'src/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@33dd24659147bd7ed2fa87aeacc52d199be766b4',
@@ -453,13 +453,13 @@ deps = {
    Var('dart_git') + '/source_maps.git@87dc58736b5bd334502005cdbd4d325aba9bc696',
 
   'src/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@ed16e0d1323f15e478027430b53e0ef0dbc25a83',
+   Var('dart_git') + '/source_span.git@9398e2464e24d2f15cccfa1199381a6247403829',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@8ddb95fbe7c07d91aee92f35f70ac5c839f82c35',
+   Var('dart_git') + '/sse.git@1df63f2dcea3fa2e57b46b47a8e043c8b2796a2e',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@6496ff88cf5c168c2548a454160c27004d176009',
+   Var('dart_git') + '/stack_trace.git@4abff4489b93e6bbc82063343e666ccda9f62e8e',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
    Var('dart_git') + '/stream_channel.git@178104d0f1316b0120cf0031b8dbae0cbfec4c26',
@@ -468,13 +468,13 @@ deps = {
    Var('dart_git') + '/string_scanner.git@a7105ef03ed8373c7d995461fcf4994a6f4e781d',
 
   'src/third_party/dart/third_party/pkg/tar':
-   Var('dart_git') + '/external/github.com/simolus3/tar.git@3383397b082c084c327587a293591fac74bc8af3',
+   Var('dart_git') + '/external/github.com/simolus3/tar.git@0fc831c6e93be5342d4863d9e464428e73007cce',
 
   'src/third_party/dart/third_party/pkg/term_glyph':
    Var('dart_git') + '/term_glyph.git@7c1eb9d799a3cbbc554c3a283af4d6cee9043297',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@8ba0940d24e36b9276a18b34cd8d6fe396d2c172',
+   Var('dart_git') + '/test.git@a0a4d1ee1a7b27a28a87e519722198272e64aae8',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@17d40bb06f55f727a79c0f0016d7510294f5db03',
@@ -492,7 +492,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@82ac73fef05c474095c740a9525b4cfb61611c3d',
+   Var('dart_git') + '/web_socket_channel.git@5241175e7c66271850d6e75fb9ec90068f9dd3c4',
 
   'src/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -618,7 +618,7 @@ deps = {
   'src/third_party/colorama/src':
    Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
 
-  'src/third_party/expat':
+  'src/flutter/third_party/expat':
    Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + '654d2de0da85662fcc7644a7acd7c2dd2cfb21f0',
 
   'src/third_party/freetype2':
@@ -630,27 +630,21 @@ deps = {
   'src/flutter/third_party/skia':
    Var('skia_git') + '/skia.git' + '@' +  Var('skia_revision'),
 
-  'src/third_party/ocmock':
+  'src/flutter/third_party/ocmock':
    Var('ocmock_git') + '@' +  Var('ocmock_rev'),
 
-  'src/third_party/libjpeg-turbo':
+  'src/flutter/third_party/libjpeg-turbo/src':
    Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 
   'src/third_party/libpng':
    Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
 
-  'src/third_party/libwebp':
+  'src/flutter/third_party/libwebp':
    Var('chromium_git') + '/webm/libwebp.git' + '@' + '2af26267cdfcb63a88e5c74a85927a12d6ca1d76', # 1.3.1
 
-  'src/third_party/wuffs':
+  'src/flutter/third_party/wuffs':
    Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
 
-  'src/third_party/fontconfig/src':
-   Var('chromium_git') + '/external/fontconfig.git' + '@' + 'c336b8471877371f0190ba06f7547c54e2b890ba',
-
-  'src/third_party/fontconfig':
-   Var('flutter_git') + '/third_party/fontconfig' + '@' + '81c83d510ae3aa75589435ce32a5de05139aacb0',
-
   'src/third_party/libxml':
    Var('flutter_git') + '/third_party/libxml' + '@' + 'a143e452b5fc7d872813eeadc8db421694058098',
 
@@ -666,7 +660,7 @@ deps = {
   'src/flutter/third_party/sqlite':
    Var('flutter_git') + '/third_party/sqlite' + '@' + '0f61bd2023ba94423b4e4c8cfb1a23de1fe6a21c',
 
-  'src/third_party/pyyaml':
+  'src/flutter/third_party/pyyaml':
    Var('fuchsia_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
 
    'src/third_party/swiftshader':
@@ -683,7 +677,7 @@ deps = {
 
    # Dart packages
   'src/flutter/third_party/pkg/archive':
-  Var('github_git') + '/brendan-duncan/archive.git' + '@' + '9de7a0544457c6aba755ccb65abb41b0dc1db70d', # 3.1.2
+  Var('chromium_git') + '/external/github.com/brendan-duncan/archive.git' + '@' + '9de7a0544457c6aba755ccb65abb41b0dc1db70d', # 3.1.2
 
   'src/flutter/third_party/pkg/equatable':
   Var('github_git') + '/felangel/equatable.git' + '@' + '2117551ff3054f8edb1a58f63ffe1832a8d25623', # 2.0.5
@@ -950,7 +944,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'AuDKY8ob6GrGwDlmkuZkhV3xya4Bi_y2UouDFwuhNu0C'
+        'version': 'CGyrUgA1M1yFx5N5C1aFQ_Q4Y5uP_FhxctN_UCZ9BugC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

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

@@ -5,7 +5,7 @@
 config("expat_config") {
   include_dirs = [
     "expat/lib",
-    "//flutter/build/secondary/third_party/expat/expat_config",
+    "//flutter/build/secondary/flutter/third_party/expat/expat_config",
   ]
 
   defines = [