diff --git a/BUILD.gn b/BUILD.gn
index 107f3da944c0daad128b99111f5d10c9a10da02c..7a102d594bf570c401e4a55e5682fd014a56ab81 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -101,7 +101,7 @@ group("flutter") {
 
   if (build_engine_artifacts) {
     public_deps += [
-      "//flutter/shell/testing",
+      "//flutter/shell/testing($host_toolchain)",
       "//flutter/tools/const_finder",
       "//flutter/tools/font-subset",
     ]
diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.cc b/impeller/renderer/backend/vulkan/render_pass_vk.cc
index 5c3e3984088d6e81e6930c8926359b41c197d6f1..08d4cd6fadc26d83d29c0f120eb54411bff50ab9 100644
--- a/impeller/renderer/backend/vulkan/render_pass_vk.cc
+++ b/impeller/renderer/backend/vulkan/render_pass_vk.cc
@@ -1,6 +1,7 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+#pragma clang diagnostic ignored "-Wreturn-type"
 
 #include "impeller/renderer/backend/vulkan/render_pass_vk.h"
 
diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni
index 2badbbff65bb32ef21d102be5582d5efaef9e653..3df2553437f568f3cef604c7f748976abc9c08c2 100644
--- a/impeller/tools/impeller.gni
+++ b/impeller/tools/impeller.gni
@@ -11,14 +11,14 @@ declare_args() {
   impeller_enable_playground = false
 
   # Whether the Metal backend is enabled.
-  impeller_enable_metal = is_mac || is_ios
+  impeller_enable_metal = is_ios
 
   # Whether the OpenGLES backend is enabled.
-  impeller_enable_opengles = is_mac || is_linux || is_win || is_android ||is_ohos
+  impeller_enable_opengles = is_linux || is_win || is_android ||is_ohos
 
   # Whether the Vulkan backend is enabled.
   #impeller_enable_vulkan = is_mac || is_linux || is_win || is_android
-  impeller_enable_vulkan = is_mac  || is_win || is_android
+  impeller_enable_vulkan = is_win || is_android
 
   # Whether to use a prebuilt impellerc.
   # If this is the empty string, impellerc will be built.
diff --git a/test b/test
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391