Merge remote-tracking branch 'origin/main' into settings-system-font

Author: robert-ancell

.ci.yaml

@@ -100,7 +100,7 @@ platform_properties:
 
 targets:
   - name: Linux Android AOT Engine
-    recipe: engine
+    recipe: engine/engine
     properties:
       add_recipes_cq: "true"
       build_android_aot: "true"
@@ -110,7 +110,7 @@ targets:
     scheduler: luci
 
   - name: Linux Android Debug Engine
-    recipe: engine
+    recipe: engine/engine
     properties:
       add_recipes_cq: "true"
       build_android_debug: "true"
@@ -121,7 +121,7 @@ targets:
     timeout: 60
     scheduler: luci
 
-  - name: Linux Android Scenarios
+  - name: Linux Android Emulator Tests
     bringup: true # Recipe issue https://github.com/flutter/flutter/issues/86427
     recipe: engine/scenarios
     properties:
@@ -155,7 +155,7 @@ targets:
     scheduler: luci
 
   - name: Linux Fuchsia
-    recipe: engine
+    recipe: engine/engine
     properties:
       add_recipes_cq: "true"
       build_fuchsia: "true"
@@ -164,7 +164,7 @@ targets:
     scheduler: luci
 
   - name: Linux Fuchsia FEMU
-    recipe: femu_test
+    recipe: engine/femu_test
     properties:
       add_recipes_cq: "true"
       build_fuchsia: "true"
@@ -181,15 +181,22 @@ targets:
     scheduler: luci
 
   - name: Linux Host Engine
-    recipe: engine
+    recipe: engine/engine
     properties:
       add_recipes_cq: "true"
       build_host: "true"
     timeout: 60
     scheduler: luci
 
   - name: Linux Unopt
-    recipe: engine_unopt
+    recipe: engine/engine_unopt
+    properties:
+      add_recipes_cq: "true"
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux clang-tidy
+    recipe: engine/engine_lint
     properties:
       add_recipes_cq: "true"
     timeout: 60
@@ -203,8 +210,17 @@ targets:
     timeout: 90
     scheduler: luci
 
+  - name: Linux linux_host_engine
+    recipe: engine_v2/engine_v2
+    bringup: true
+    timeout: 60
+    properties:
+      config_name: linux_host_engine
+      environment: Staging
+    scheduler: luci
+
   - name: Linux Web Engine
-    recipe: web_engine
+    recipe: engine/web_engine
     properties:
       add_recipes_cq: "true"
       gcs_goldens_bucket: flutter_logs
@@ -244,7 +260,7 @@ targets:
       - flutter_frontend_server/**
 
   - name: Mac Android AOT Engine
-    recipe: engine
+    recipe: engine/engine
     properties:
       android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
       android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
@@ -254,7 +270,7 @@ targets:
     scheduler: luci
 
   - name: Mac Host Engine
-    recipe: engine
+    recipe: engine/engine
     properties:
       add_recipes_cq: "true"
       build_host: "true"
@@ -263,15 +279,23 @@ targets:
     scheduler: luci
 
   - name: Mac Unopt
-    recipe: engine_unopt
+    recipe: engine/engine_unopt
+    properties:
+      add_recipes_cq: "true"
+      jazzy_version: 0.9.5
+    timeout: 75
+    scheduler: luci
+
+  - name: Mac clang-tidy
+    recipe: engine/engine_lint
     properties:
       add_recipes_cq: "true"
       jazzy_version: 0.9.5
     timeout: 75
     scheduler: luci
 
   - name: Mac iOS Engine
-    recipe: engine
+    recipe: engine/engine
     properties:
       build_ios: "true"
       ios_debug: "true"
@@ -280,8 +304,9 @@ targets:
     scheduler: luci
 
   - name: Mac Web Engine
-    recipe: web_engine
+    recipe: engine/web_engine
     properties:
+      add_recipes_cq: "true"
       gcs_goldens_bucket: flutter_logs
       dependencies: >-
         [
@@ -304,6 +329,10 @@ targets:
     properties:
       config_name: mac_ios_engine
       environment: Staging
+      dependencies: >-
+        [
+          {"dependency": "jazzy"}
+        ]
     scheduler: luci
 
   - name:  Mac mac_ios_engine_profile
@@ -325,7 +354,7 @@ targets:
     scheduler: luci
 
   - name: Windows Android AOT Engine
-    recipe: engine
+    recipe: engine/engine
     properties:
       build_android_aot: "true"
       android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
@@ -334,7 +363,7 @@ targets:
     scheduler: luci
 
   - name: Windows Host Engine
-    recipe: engine
+    recipe: engine/engine
     timeout: 60
     properties:
       add_recipes_cq: "true"
@@ -360,21 +389,21 @@ targets:
     scheduler: luci
 
   - name: Windows Unopt
-    recipe: engine_unopt
+    recipe: engine/engine_unopt
     properties:
       add_recipes_cq: "true"
     timeout: 75
     scheduler: luci
 
   - name: Windows UWP Engine
-    recipe: engine
+    recipe: engine/engine
     properties:
       build_windows_uwp: "true"
     timeout: 60
     scheduler: luci
 
   - name: Windows Web Engine
-    recipe: web_engine
+    recipe: engine/web_engine
     properties:
       gcs_goldens_bucket: flutter_logs
     timeout: 60
@@ -386,7 +415,7 @@ targets:
 
   - name: Mac iOS Engine Profile
     presubmit: false
-    recipe: engine
+    recipe: engine/engine
     properties:
       build_ios: "true"
       ios_profile: "true"
@@ -396,7 +425,7 @@ targets:
 
   - name: Mac iOS Engine Release
     presubmit: false
-    recipe: engine
+    recipe: engine/engine
     properties:
       build_ios: "true"
       ios_release: "true"
@@ -407,4 +436,3 @@ targets:
   - name: Linux ci_yaml engine roller
     bringup: true
     recipe: infra/ci_yaml
-    scheduler: luci

.cirrus.yml

@@ -1,4 +1,4 @@
-gcp_credentials: ENCRYPTED[!cc769765170bebc37e0556e2da5915ca64ee37f4ec8c966ec147e2f59578b476c99e457eafce4e2f8b1a4e305f7096b8!]
+gcp_credentials: ENCRYPTED[!2c88dee9c9d9805b214c9f7ad8f3bc8fae936cdb0f881d562101151c408c7e024a41222677d5831df90c60d2dd6cd80a!]
 
 # LINUX
 task:

.clang-tidy

@@ -1,13 +1,20 @@
 # Prefix check with "-" to ignore.
 Checks: "google-*,\
+clang-analyzer-*,\
+clang-diagnostic-*,\
 -google-objc-global-variable-declaration,\
--google-objc-avoid-throwing-exception"
+-google-objc-avoid-throwing-exception,\
+-clang-analyzer-nullability.NullPassedToNonnull,\
+-clang-analyzer-nullability.NullablePassedToNonnull,\
+-clang-analyzer-nullability.NullReturnedFromNonnull,\
+-clang-analyzer-nullability.NullableReturnedFromNonnull"
 
 # Only warnings treated as errors are reported
 # in the "ci/lint.sh" script and pre-push git hook.
 # Add checks when all warnings are fixed
 # to prevent new warnings being introduced.
 # https://github.com/flutter/flutter/issues/93279
-WarningsAsErrors: "clang-analyzer-osx.*,\
+WarningsAsErrors: "clang-analyzer-*,\
+clang-diagnostic-*,\
 google-objc-*,\
 google-explicit-constructor"

BUILD.gn

@@ -68,6 +68,7 @@ group("flutter") {
 
   # Compile the engine.
   public_deps = [
+    ":unittests",
     "//flutter/shell/platform/embedder:flutter_engine",
     "//flutter/sky",
   ]
@@ -129,7 +130,12 @@ group("flutter") {
       current_cpu == "arm64") {
     public_deps += [ "//flutter/testing/android_background_image" ]
   }
+}
+
+group("unittests") {
+  testonly = true
 
+  public_deps = []
   if (is_android) {
     public_deps +=
         [ "//flutter/shell/platform/android:flutter_shell_native_unittests" ]
@@ -145,6 +151,7 @@ group("flutter") {
       "//flutter/lib/spirv/test/supported_glsl_op_shaders:spirv_compile_supported_glsl_shaders",
       "//flutter/lib/spirv/test/supported_op_shaders:spirv_compile_supported_op_shaders",
       "//flutter/lib/ui:ui_unittests",
+      "//flutter/runtime:dart_plugin_registrant_unittests",
       "//flutter/runtime:no_dart_plugin_registrant_unittests",
       "//flutter/runtime:runtime_unittests",
       "//flutter/shell/common:shell_unittests",