[Logs] Cleaning code from debug logs

.cirrus.yml

@@ -1,10 +1,11 @@
-gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
+gcp_credentials: ENCRYPTED[a4b6c1cb428a657573b775d39dd8006beed3013d01ca3d1a3972bdc2bd39bb937dd91ea3d98eeb9ce55e4bd303d045d3]
 
 # LINUX
 task:
   gke_container:
     dockerfile: "ci/docker/build/Dockerfile"
     builder_image_name: docker-builder # gce vm image
+    builder_image_project: flutter-cirrus
     cluster_name: build-32-cluster
     zone: us-central1-a
     namespace: default
@@ -19,9 +20,6 @@ task:
     FRAMEWORK_PATH: "/tmp/master_framework"
     PATH: "$FLUTTER_ENGINE/third_party/dart/tools/sdks/dart-sdk/bin:$DEPOT_TOOLS:$PATH"
     USE_ANDROID: "False"
-    # TODO(liyuqian): currently we're using flutter-cirrus GCP project. Migrate
-    # to flutter-infra project once the metrics_center service is stabilized,
-    BENCHMARK_GCP_CREDENTIALS: ENCRYPTED[da76d2b7b39894de70fae1fc9182c97cc41400adc93f0f1c49bc7442f15fb933da8d756ed88523810a9a77c34f51a693]
   setup_script: |
     git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS
     mkdir -p $ENGINE_PATH/src
@@ -55,7 +53,7 @@ task:
         bin/flutter analyze --dartdocs --flutter-repo --local-engine=host_debug_unopt
       test_framework_script: |
         cd $FRAMEWORK_PATH/flutter/packages/flutter
-        ../../bin/flutter test --local-engine=host_debug_unopt --null-assertions --sound-null-safety --enable-experiment=non-nullable
+        ../../bin/flutter test --local-engine=host_debug_unopt --null-assertions --sound-null-safety
     # TODO(fujino): remove this once ci/licenses.sh is run on LUCI
     - name: licenses_check
       build_script: |

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,7 +10,7 @@
 - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
 - [ ] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides].
 - [ ] I listed at least one issue that this PR fixes in the description above.
-- [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt. See [testing the engine] for instructions on
+- [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See [testing the engine] for instructions on
 writing and running engine tests.
 - [ ] I updated/added relevant documentation (doc comments with `///`).
 - [ ] I signed the [CLA].

BUILD.gn

@@ -24,10 +24,14 @@ config("config") {
   # This define is transitional and will be removed after the embedder API
   # transition is complete.
   #
-  # TODO(bugs.fuchsia.dev/54041): Remove when no longer neccesary.
+  # TODO(bugs.fuchsia.dev/54041): Remove when no longer necessary.
   if (is_fuchsia && flutter_enable_legacy_fuchsia_embedder) {
     defines = [ "LEGACY_FUCHSIA_EMBEDDER" ]
   }
+
+  if (is_debug) {
+    defines = [ "FLUTTER_ENABLE_DIFF_CONTEXT" ]
+  }
 }
 
 config("export_dynamic_symbols") {
@@ -48,8 +52,7 @@ group("flutter") {
 
   # Flutter SDK artifacts should only be built when either doing host builds, or
   # for cross-compiled desktop targets.
-  build_engine_artifacts =
-      current_toolchain == host_toolchain || (is_linux && !is_chromeos)
+  build_engine_artifacts = current_toolchain == host_toolchain
 
   # If enbaled, compile the SDK / snapshot.
   if (!is_fuchsia) {
@@ -108,8 +111,8 @@ group("flutter") {
       "//flutter/third_party/txt:txt_unittests",
     ]
 
-    # The accessibility library only supports Mac for now.
-    if (is_mac) {
+    # The accessibility library only supports Mac and Windows at the moment.
+    if (is_mac || is_win) {
       public_deps +=
           [ "//flutter/third_party/accessibility:accessibility_unittests" ]
     }
@@ -135,15 +138,15 @@ group("flutter") {
     # embeddings are being built.
     if (enable_desktop_embeddings) {
       public_deps += [
-        "//flutter/shell/platform/common/cpp:common_cpp_core_unittests",
-        "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
+        "//flutter/shell/platform/common:common_cpp_core_unittests",
+        "//flutter/shell/platform/common/client_wrapper:client_wrapper_unittests",
       ]
 
       if (!is_fuchsia) {
         # These tests require the embedder and thus cannot run on fuchsia.
         # TODO(): Enable when embedder works on fuchsia.
         public_deps +=
-            [ "//flutter/shell/platform/common/cpp:common_cpp_unittests" ]
+            [ "//flutter/shell/platform/common:common_cpp_unittests" ]
 
         # These tests require GLFW and thus cannot run on fuchsia.
         public_deps += [ "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests" ]
@@ -164,8 +167,10 @@ group("flutter") {
 
       if (is_win) {
         if (target_os == "winuwp") {
-          # TODO: Add winnup variant of the unit tests here; see
+          # TODO: Add winnup variant of client_wrapper_windows_unittests here; see
           # https://github.com/flutter/flutter/issues/70197
+          public_deps +=
+              [ "//flutter/shell/platform/windows:flutter_windows_unittests" ]
         } else {
           public_deps += [
             "//flutter/shell/platform/windows:flutter_windows_unittests",