Skip to content

Commit

Permalink
Move vulkan-deps to //flutter/third_party/vulkan-deps (#828)
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-simmons authored Feb 27, 2024
1 parent 21b1b9f commit 2f684ab
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions build_overrides/angle.gni
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ if (!is_fuchsia) {

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

# Note: This path doesn't actually exist; see
# //build/secondary/third_party/jsoncpp/BUILD.gn
angle_jsoncpp_dir = "//third_party/jsoncpp"
angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
angle_libpng_dir = "//flutter/third_party/libpng"
angle_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
angle_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
angle_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"
angle_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src"
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
angle_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator"

# This is a general Chromium flag, but in the Flutter build only ANGLE needs it
Expand Down
4 changes: 2 additions & 2 deletions build_overrides/glslang.gni
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

glslang_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
2 changes: 1 addition & 1 deletion build_overrides/spirv_tools.gni
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ spirv_tools_standalone = false

# Paths to SPIRV-Tools dependencies in Flutter.
spirv_tools_googletest_dir = "//third_party/googletest/googletest/src"
spirv_tools_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
spirv_tools_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
2 changes: 1 addition & 1 deletion build_overrides/vulkan_loader.gni
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

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

# Vulkan loader build options
vulkan_loader_shared = true
2 changes: 1 addition & 1 deletion build_overrides/vulkan_tools.gni
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

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

# Subdirectories for generated files
vulkan_data_subdir = ""
Expand Down
2 changes: 1 addition & 1 deletion build_overrides/vulkan_utility_libraries.gni
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
8 changes: 4 additions & 4 deletions build_overrides/vulkan_validation_layers.gni
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
vulkan_utility_libraries_dir = "//third_party/vulkan-deps/vulkan-utility-libraries/src"
vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
vvl_glslang_dir = "//third_party/vulkan-deps/spirv-tools/src"
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
vulkan_utility_libraries_dir = "//flutter/third_party/vulkan-deps/vulkan-utility-libraries/src"
vvl_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
vvl_glslang_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"

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

Expand Down

0 comments on commit 2f684ab

Please sign in to comment.