Merge branch 'main' into web_test_reorganization

.ci.yaml

@@ -261,6 +261,14 @@ targets:
       release_build: "true"
       config_name: linux_host_engine
 
+  - name: Linux linux_host_desktop_engine
+    bringup: true
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      release_build: "true"
+      config_name: linux_host_desktop_engine
+
   - name: Linux linux_android_aot_engine
     recipe: engine_v2/engine_v2
     timeout: 60
@@ -275,20 +283,12 @@ targets:
       release_build: "true"
       config_name: linux_android_debug_engine
 
-  - name: Linux Web Engine (V2)
+  - name: Linux linux_web_engine
     recipe: engine_v2/engine_v2
-    bringup: true
-    properties:
-      config_name: web_engine
     timeout: 60
-    runIf:
-      - DEPS
-      - .ci.yaml
-      - lib/web_ui/**
-      - web_sdk/**
-      - tools/**
-      - ci/**
-      - flutter_frontend_server/**
+    properties:
+      release_build: "true"
+      config_name: linux_web_engine
 
   - name: Linux Web Framework tests
     recipe: engine/web_engine_framework

CODEOWNERS

@@ -1,4 +1,5 @@
-# This file defines an Application Binary Interface (ABI) that must maintain
+# The following files define an Application Binary Interface (ABI) that must maintain
 # both forward and backward compatibility. Changes should be heavily
 # scrutinized as mistakes are irreversible.
 /shell/platform/embedder/embedder.h @cbracken @chinmaygarde
+/shell/platform/embedder/tests/embedder_frozen.h @cbracken @chinmaygarde @loic-sharma

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': 'a0ab1e7344901ebe830057b3ac129c05176ef1c7',
+  'skia_revision': '3e47f1b18dacac4dd7acc02383116ada2e4fabda',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,7 +48,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': 'a32e24068a6cbfddc1697f907e5bcdec42887966',
+  'dart_revision': 'e3a6035e071976fc551e1c896326a0cd1be671f2',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -239,7 +239,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '64b0c3deecaff8e66c2deb74e2171e8297b2bfcd',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '93f7f85422a8604bdc44ef76c3f105ead65e8c1c',
 
    # Fuchsia compatibility
    #
@@ -332,7 +332,7 @@ deps = {
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@3851652a72ee572ec7371942a658788c61847dea',
+   Var('dart_git') + '/cli_util.git@91747f7dd9bdf2457f081d3cf035de5672dd4a02',
 
   'src/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -350,10 +350,10 @@ deps = {
    Var('dart_git') + '/csslib.git@b671738dc6de7d212b5f943b4258f9bb099d3e83',
 
   'src/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@4aebeb3bcce2a62c1d37fd48decf6e90259a4715',
+   Var('dart_git') + '/dart_style.git@a740aabf43a8b668a8abf8de0530a9f25bb1f5e6',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@e4cdbd6f349ecbc420d33cca69a02fb287a7edf5',
+   Var('dart_git') + '/dartdoc.git@77d59945d3af50328aa28b87002437e8f2e6333b',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@32f5eefea59d4461e8ab40e83f157e49d5abe0da',
@@ -454,6 +454,9 @@ deps = {
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@c4c2d5c3f94a96f3fc79e9e28944fba391bc544c',
 
+  'src/third_party/dart/third_party/pkg/tools':
+   Var('dart_git') + '/tools.git@28b7be83589d0d7a6d44cbe6166b6673f08018fb',
+
   'src/third_party/dart/third_party/pkg/typed_data':
    Var('dart_git') + '/typed_data.git@f858046fb420cf644e7d8cb86b7893f2830d8a6c',
 
@@ -829,7 +832,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'oGC2UFWpzRXTrEiJg0vgDp6_GFGxgWS1vz2U3kDcU4EC'
+        'version': 'nj4pClkOciFXkzMRKIKvAiGg1eQ1tt6G8Xt8z61qav4C'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -839,7 +842,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '69m3Jn73L34XwlsWHJhDvNm8Hk1JV6lLb_5qeb7CjX4C'
+        'version': '-04__Nnx6VDMwXnnuk2VYzFCbHyCK_MKTGWLz7SKB-gC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/builders/linux_host_desktop_engine.json

@@ -0,0 +1,105 @@
+{
+    "builds": [
+        {
+            "archives": [
+                {
+                    "name": "host_debug",
+                    "base_path": "out/host_debug/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_debug/zip_archives/linux-x64-debug/linux-x64-flutter-gtk.zip"
+                    ]
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk"
+            ],
+            "name": "host_debug",
+            "ninja": {
+                "config": "host_debug",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            },
+            "tests": []
+        },
+        {
+            "archives": [
+                {
+                    "name": "host_profile",
+                    "base_path": "out/host_profile/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_profile/zip_archives/linux-x64-profile/linux-x64-flutter-gtk.zip"
+                    ]
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false
+            },
+            "gn": [
+                "--runtime-mode",
+                "profile",
+                "--no-lto",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk"
+            ],
+            "name": "host_profile",
+            "ninja": {
+                "config": "host_profile",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            },
+            "tests": []
+        },
+        {
+            "archives": [
+                {
+                    "name": "host_release",
+                    "base_path": "out/host_release/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_release/zip_archives/linux-x64-release/linux-x64-flutter-gtk.zip"
+                    ]
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false
+            },
+            "gn": [
+                "--runtime-mode",
+                "release",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk"
+            ],
+            "name": "host_release",
+            "ninja": {
+                "config": "host_release",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            },
+            "tests": []
+        }
+    ],
+    "tests": []
+}