Vulkan: Fix ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT

src/common/vulkan/BUILD.gn

@@ -35,18 +35,6 @@ angle_source_set("vulkan") {
     data_deps += [ "$angle_root/third_party/vulkan-tools/src:VkICD_mock_icd" ]
   }
 
-  if (angle_enable_vulkan_validation_layers) {
-    defines += [ "ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT" ]
-    if (is_fuchsia) {
-      data_deps += [ "//third_party/fuchsia-sdk:vulkan_validation" ]
-    } else {
-      data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_validation_layers" ]
-      if (!is_android) {
-        data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_gen_json_files" ]
-      }
-    }
-  }
-
   if (angle_enable_swiftshader) {
     import("$swiftshader_dir/src/Vulkan/vulkan.gni")
     _sws_icd = "./$swiftshader_icd_file_name"
@@ -62,3 +50,15 @@ angle_source_set("vulkan") {
     ]
   }
 }
+
+group("vulkan_validation_layers") {
+  data_deps = []
+  if (is_fuchsia) {
+    data_deps += [ "//third_party/fuchsia-sdk:vulkan_validation" ]
+  } else {
+    data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_validation_layers" ]
+    if (!is_android) {
+      data_deps += [ "$angle_root/third_party/vulkan-validation-layers/src:vulkan_gen_json_files" ]
+    }
+  }
+}

src/libANGLE/renderer/vulkan/BUILD.gn

@@ -247,6 +247,13 @@ angle_source_set("angle_vulkan_backend") {
 
   data_deps = []
 
+  defines = []
+
+  if (angle_enable_vulkan_validation_layers) {
+    defines += [ "ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT" ]
+    data_deps += [ "$angle_root/src/common/vulkan:vulkan_validation_layers" ]
+  }
+
   if (is_android) {
     libs += [ "vulkan" ]
   }

src/tests/BUILD.gn

@@ -93,6 +93,10 @@ template("angle_common_test_utils") {
         "test_utils/angle_test_instantiate_apple.mm",
       ]
     }
+    data_deps = []
+    if (angle_enable_vulkan) {
+      data_deps += [ "$angle_root/src/common/vulkan:vulkan_validation_layers" ]
+    }
   }
 }