Use .gn to set overrides for VulkanMemoryAllocator
Bug: tint:700
Bug: chromium:1195554
Change-Id: I937a1123ff677dfe1c40891d8cbd1c10d9def1e3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46864
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
diff --git a/.gn b/.gn
index b506763..2b8936e 100644
--- a/.gn
+++ b/.gn
@@ -25,19 +25,15 @@
mac_min_system_version = "10.11.0"
angle_enable_abseil = false
-
angle_standalone = false
-
angle_build_all = false
-
angle_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
-
angle_vulkan_loader_dir = "//third_party/vulkan-deps/vulkan-loader/src"
-
angle_vulkan_tools_dir = "//third_party/vulkan-deps/vulkan-tools/src"
-
angle_vulkan_validation_layers_dir =
"//third_party/vulkan-deps/vulkan-validation-layers/src"
+
+ vma_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
}
check_targets = [
diff --git a/build_overrides/vulkan_memory_allocator.gni b/build_overrides/vulkan_memory_allocator.gni
deleted file mode 100644
index 7bd4d99..0000000
--- a/build_overrides/vulkan_memory_allocator.gni
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021 The Dawn Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build_overrides/vulkan_common.gni")
