commit f42f8639fb29e49340de676eb96dd71624763609
author Corentin Wallez <cwallez@chromium.org> Mon Jul 03 17:48:39 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jul 03 17:48:39 2023 +0000
tree 32bc525e67b0e3ce7d3005b2fda7ab7dc7498c66
parent c12aad402ca4a483b021248161a826ebe67a07f4

Weak linking to Metal.framework is no longer needed.

This was useful when Chromium shipped on versions of macOS without Metal
but this is no longer the case.

Bug: None
Change-Id: Ib920cc7f2db320bc211a196625dbdbdaa687237f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/140120
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/dawn/native/BUILD.gn

diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index f4e5339..dd12e78 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -65,12 +65,6 @@
   ]
 }
 
-config("weak_framework") {
-  if (is_mac && dawn_enable_metal) {
-    weak_frameworks = [ "Metal.framework" ]
-  }
-}
-
 # Config that adds the @executable_path rpath if needed so that Swiftshader or the Vulkan loader are found.
 config("vulkan_rpath") {
   if (is_mac && dawn_enable_vulkan &&
@@ -574,6 +568,7 @@
     frameworks = [
       "IOKit.framework",
       "IOSurface.framework",
+      "Metal.framework",
     ]
     if (is_mac) {
       frameworks += [
@@ -855,10 +850,7 @@
   ]
   sources = [ "DawnNative.cpp" ]
   configs = [ ":internal" ]
-  public_configs = [
-    ":weak_framework",
-    ":vulkan_rpath",
-  ]
+  public_configs = [ ":vulkan_rpath" ]
 
   if (dawn_enable_d3d11 || dawn_enable_d3d12) {
     sources += [ "d3d/D3DBackend.cpp" ]