Commit 7a79fefb authored by Wez's avatar Wez Committed by Commit Bot

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

This reverts commit eddd5af6.

Reason for revert: Appears to have caused ARM64 and Debug bots to
fail on waterfall, due to MISSING files.

Original change's description:
> [fuchsia] Migrate to use Fuchsia SDK Vulkan package rules.
> 
> Bug: 1050703, fuchsia:46115
> Change-Id: I3e8c795e616bc803513efd33cff64ca95a625875
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2058968
> Commit-Queue: Wez <wez@chromium.org>
> Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#742595}

TBR=wez@chromium.org,sergeyu@chromium.org

Change-Id: If4eedd955b95391da6fc45454876a93411ecb986
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1050703, fuchsia:46115
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2063018Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742599}
parent b5bbd1e3
......@@ -7,20 +7,58 @@ assert(is_fuchsia)
import("//build/toolchain/toolchain.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") {
data_deps = [
":vulkan_base_configs",
":vulkan_image_pipe",
"sdk/pkg/trace-engine",
"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") {
data_deps = [
"sdk/pkg/vulkan_layers:VkLayer_core_validation",
"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",
":vulkan_validation_configs",
":vulkan_validation_libs",
]
}
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