[component_index] Prepare for deprecation
The cmx component index is going away. 👋
Bug: 100906
Change-Id: Idb4692c1ab4e68750a2ad05a201a3443cb2a6057
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/Vulkan-Tools/+/682203
Reviewed-by: John Bauman <jbauman@google.com>
diff --git a/cube/BUILD.gn b/cube/BUILD.gn
index fb346f3..b5abdf9 100644
--- a/cube/BUILD.gn
+++ b/cube/BUILD.gn
@@ -16,7 +16,6 @@
import("//build/components/fuchsia_package_with_single_component.gni")
import("//build_overrides/vulkan_tools.gni")
import("//src/lib/vulkan/layers.gni")
-import("//src/sys/component_index/component_index.gni")
group("cube") {
testonly = true
@@ -27,17 +26,11 @@
]
}
-add_to_component_index("fb-component-index") {
- package_name = "vkcube-on-fb"
- manifest = "meta/vkcube-on-fb.cmx"
-}
-
fuchsia_package_with_single_component("vkcube-on-fb") {
testonly = true
deps = [
":cube-fb",
- ":fb-component-index",
"//src/lib/vulkan/swapchain:image_pipe_swapchain_fb_layer",
"//src/lib/vulkan/validation_layers",
]
@@ -46,17 +39,11 @@
manifest = "fuchsia/meta/vkcube-on-fb.cmx"
}
-add_to_component_index("scenic-component-index") {
- package_name = "vkcube-on-scenic"
- manifest = "meta/vkcube-on-scenic.cmx"
-}
-
fuchsia_package_with_single_component("vkcube-on-scenic") {
testonly = true
deps = [
":cube-scenic",
- ":scenic-component-index",
"//src/lib/vulkan/swapchain:image_pipe_swapchain_layer",
"//src/lib/vulkan/validation_layers",
]
@@ -65,17 +52,11 @@
manifest = "fuchsia/meta/vkcube-on-scenic.cmx"
}
-add_to_component_index("skip-present-component-index") {
- package_name = "vkcube-skip-present"
- manifest = "meta/vkcube-skip-present.cmx"
-}
-
fuchsia_package_with_single_component("vkcube-skip-present") {
testonly = true
deps = [
":cube-skip-present",
- ":skip-present-component-index",
"//src/lib/vulkan/swapchain:image_pipe_swapchain_fb_skip_present_layer",
"//src/lib/vulkan/validation_layers",
]
