GN: Rely on the Chromium macOS deployment target again.
Chromium requires macOS 10.11 so we no longer need to special case this
in Dawn for Metal support anymore.
Bug: None
Change-Id: Ib5dee5464a3ec27abdd0f5c62e51caa42171fadb
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88303
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
diff --git a/.gn b/.gn
index 3860440..9715b46 100644
--- a/.gn
+++ b/.gn
@@ -20,13 +20,6 @@
default_args = {
clang_use_chrome_plugins = false
- # Override the mac version so standalone Dawn compiles with at least 10.11
- # which allows us to not skip the -Wunguarded-availability warning and get
- # proper warnings for use of APIs that are 10.12 and above (even if
- # Chromium is still on 10.10).
- mac_deployment_target = "10.11.0"
- mac_min_system_version = "10.11.0"
-
angle_enable_abseil = false
angle_standalone = false
angle_build_all = false
diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index 28dc072..6e3bd45 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -19,15 +19,6 @@
import("${dawn_root}/scripts/dawn_component.gni")
import("${dawn_root}/scripts/dawn_features.gni")
-# Import mac_deployment_target
-if (is_mac) {
- if (dawn_has_build) {
- import("//build/config/mac/mac_sdk.gni")
- } else {
- mac_deployment_target = "10.11.0"
- }
-}
-
# The VVLs are an optional dependency, only use it if the path has been set.
enable_vulkan_validation_layers = dawn_enable_vulkan_validation_layers &&
dawn_vulkan_validation_layers_dir != ""
@@ -66,20 +57,6 @@
config("internal") {
configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
-
- # Suppress warnings that Metal isn't in the deployment target of Chrome:
- # initialization of the Metal backend is behind a IsMetalSupported check so
- # Dawn won't call Metal functions on macOS 10.10.
- # At the time this is written Chromium supports 10.10.0 and above, so if we
- # aren't on 10.11 it means we are on 10.11 and above, and Metal is available.
- # Skipping this check on 10.11 and above is important as it allows getting
- # proper compilation warning when using 10.12 and above feature for example.
- # TODO(crbug.com/1004024): Consider using API_AVAILABLE annotations on all
- # metal code in dawn once crbug.com/1004024 is sorted out if Chromium still
- # supports 10.10 then.
- if (is_mac && mac_deployment_target == "10.10.0") {
- cflags_objcc = [ "-Wno-unguarded-availability" ]
- }
}
config("weak_framework") {
