Don't build vulkan_validation_layers on macOS.

angle_enable_vulkan_validation_layers is false on is_mac, so it looks like they were built by accident. Guard the dep on $angle_root/src/common/vulkan:vulkan_validation_layers by angle_enable_vulkan_validation_layers instead of angle_enable_vulkan, and only define the target if angle_enable_vulkan_validation_layers is true (because src/common/vulkan/BUILD.gn gets loaded due to deps on other targets in it, and when a .gn file is loaded all the targets in it get defined). Since vulkan_validation_layers doesn't currently build on arm macs, this happens to fix a build problem there, but it also makes the build on intel macs a bit smaller. This sidesteps comment 13 on the bug. If we ever want to use the validation layers on mac, we'll have to do a real fix then. Bug: chromium:1098741 Change-Id: I8164ff13de98d34ed875c6e6d0550eae64b2d0dd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2289042 Commit-Queue: Nico Weber <thakis@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Don't build vulkan_validation_layers on macOS.
fac68170 · Nico Weber · a740b193 · fac68170 · fac68170
Commit fac68170 authored Jul 08, 2020 by Nico Weber
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

BUILD.gn src/common/vulkan/BUILD.gn +10 -8

BUILD.gn src/tests/BUILD.gn +1 -1

No files found.
--- a/src/common/vulkan/BUILD.gn
+++ b/src/common/vulkan/BUILD.gn
@@ -96,14 +96,16 @@ angle_source_set("vulkan") {
  }
 }
-group("vulkan_validation_layers") {
+if (angle_enable_vulkan_validation_layers) {
-  data_deps = []
+  group("vulkan_validation_layers") {
-  if (is_fuchsia) {
+    data_deps = []
-    data_deps += [ "//third_party/fuchsia-sdk:vulkan_validation" ]
+    if (is_fuchsia) {
-  } else {
+      data_deps += [ "//third_party/fuchsia-sdk:vulkan_validation" ]
-    data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_validation_layers" ]
+    } else {
-    if (!is_android) {
+      data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_validation_layers" ]
-      data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_gen_json_files" ]
+      if (!is_android) {
+        data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_gen_json_files" ]
+      }
    }
  }
 }
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -94,7 +94,7 @@ template("angle_common_test_utils") {
      ]
    }
    data_deps = []
-    if (angle_enable_vulkan) {
+    if (angle_enable_vulkan_validation_layers) {
      data_deps += [ "$angle_root/src/common/vulkan:vulkan_validation_layers" ]
    }
  }