Skip to content

Commit 2f684ab

Browse files
Move vulkan-deps to //flutter/third_party/vulkan-deps (#828)
See flutter/flutter#144205
1 parent 21b1b9f commit 2f684ab

7 files changed

+15
-15
lines changed

build_overrides/angle.gni

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ if (!is_fuchsia) {
1919

2020
# Overrides for ANGLE's dependencies.
2121
angle_abseil_cpp_dir = "//third_party/abseil-cpp"
22-
angle_glslang_dir = "//third_party/vulkan-deps/glslang/src"
22+
angle_glslang_dir = "//flutter/third_party/vulkan-deps/glslang/src"
2323
angle_googletest_dir = "//third_party/googletest/googletest/src"
2424

2525
# Note: This path doesn't actually exist; see
2626
# //build/secondary/third_party/jsoncpp/BUILD.gn
2727
angle_jsoncpp_dir = "//third_party/jsoncpp"
2828
angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
2929
angle_libpng_dir = "//flutter/third_party/libpng"
30-
angle_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
31-
angle_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
32-
angle_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"
33-
angle_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
30+
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
31+
angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
32+
angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src"
33+
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
3434
angle_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator"
3535

3636
# This is a general Chromium flag, but in the Flutter build only ANGLE needs it

build_overrides/glslang.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
glslang_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
6-
spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
5+
glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
6+
spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"

build_overrides/spirv_tools.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ spirv_tools_standalone = false
77

88
# Paths to SPIRV-Tools dependencies in Flutter.
99
spirv_tools_googletest_dir = "//third_party/googletest/googletest/src"
10-
spirv_tools_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
10+
spirv_tools_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"

build_overrides/vulkan_loader.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
66

77
# Vulkan loader build options
88
vulkan_loader_shared = true

build_overrides/vulkan_tools.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
66

77
# Subdirectories for generated files
88
vulkan_data_subdir = ""

build_overrides/vulkan_utility_libraries.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"

build_overrides/vulkan_validation_layers.gni

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
6-
vulkan_utility_libraries_dir = "//third_party/vulkan-deps/vulkan-utility-libraries/src"
7-
vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
8-
vvl_glslang_dir = "//third_party/vulkan-deps/spirv-tools/src"
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
6+
vulkan_utility_libraries_dir = "//flutter/third_party/vulkan-deps/vulkan-utility-libraries/src"
7+
vvl_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
8+
vvl_glslang_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
99

1010
# robin_hood_headers_dir = "//external/robin-hood-hashing/src/include"
1111

0 commit comments

Comments
 (0)