Commit 0e8164ad authored by Wez's avatar Wez Committed by Commit Bot

[fuchsia] Migrate to use Fuchsia SDK Vulkan package rules.

This is a re-land; the migration originally landed but broke compilation
of the 'all' meta-target, passing the CQ but breaking the waterfall.

Fuchsia's Vulkan rules have been fixed now, so things build cleanly
with this CL, and the trace-engine is now correctly specified by the
Vulkan rules themselves, rather than needing to be specified by Chromium.

Bug: 1050703, fuchsia:46115
Change-Id: I571ef1513a704cfc5ca6d92e548dfaa87562643f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2064219
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744319}
parent edb1aeb9
...@@ -7,58 +7,20 @@ assert(is_fuchsia) ...@@ -7,58 +7,20 @@ assert(is_fuchsia)
import("//build/toolchain/toolchain.gni") import("//build/toolchain/toolchain.gni")
import("//third_party/fuchsia-sdk/sdk/build/fuchsia_sdk_pkg.gni") import("//third_party/fuchsia-sdk/sdk/build/fuchsia_sdk_pkg.gni")
copy("vulkan_base_configs") {
sources = [ "sdk/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_image_pipe_swapchain.json" ]
outputs =
[ "${root_gen_dir}/data/vulkan/explicit_layer.d/{{source_file_part}}" ]
}
copy("vulkan_image_pipe") {
sources = [ "sdk/arch/${target_cpu}/dist/libVkLayer_image_pipe_swapchain.so" ]
outputs = [ "${root_out_dir}${shlib_subdir}/{{source_file_part}}" ]
}
group("vulkan_base") { group("vulkan_base") {
data_deps = [ data_deps = [
":vulkan_base_configs",
":vulkan_image_pipe",
"sdk/pkg/trace-engine",
"sdk/pkg/vulkan", "sdk/pkg/vulkan",
"sdk/pkg/vulkan_layers:VkLayer_image_pipe_swapchain",
] ]
} }
copy("vulkan_validation_configs") {
sources = [
"sdk/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_core_validation.json",
"sdk/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_khronos_validation.json",
"sdk/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_object_lifetimes.json",
"sdk/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_stateless_validation.json",
"sdk/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_thread_safety.json",
"sdk/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_unique_objects.json",
]
outputs =
[ "${root_gen_dir}/data/vulkan/explicit_layer.d/{{source_file_part}}" ]
}
copy("vulkan_validation_libs") {
sources = [
"sdk/arch/${target_cpu}/dist/VkLayer_core_validation.so",
"sdk/arch/${target_cpu}/dist/VkLayer_khronos_validation.so",
"sdk/arch/${target_cpu}/dist/VkLayer_object_lifetimes.so",
"sdk/arch/${target_cpu}/dist/VkLayer_stateless_validation.so",
"sdk/arch/${target_cpu}/dist/VkLayer_thread_safety.so",
"sdk/arch/${target_cpu}/dist/VkLayer_unique_objects.so",
]
outputs = [ "${root_out_dir}${shlib_subdir}/{{source_file_part}}" ]
}
group("vulkan_validation") { group("vulkan_validation") {
data_deps = [ data_deps = [
":vulkan_validation_configs", "sdk/pkg/vulkan_layers:VkLayer_core_validation",
":vulkan_validation_libs", "sdk/pkg/vulkan_layers:VkLayer_khronos_validation",
"sdk/pkg/vulkan_layers:VkLayer_object_lifetimes",
"sdk/pkg/vulkan_layers:VkLayer_stateless_validation",
"sdk/pkg/vulkan_layers:VkLayer_thread_safety",
"sdk/pkg/vulkan_layers:VkLayer_unique_objects",
] ]
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment