diff --git a/garnet/lib/magma/gnbuild/magma-intel-gen/BUILD.gn b/garnet/lib/magma/gnbuild/magma-intel-gen/BUILD.gn index 6cb9b36555c87b1a1d5f31a711e9288de0e6d47c..00e664f068c5babb793bebf612c3bb0b0d5af88b 100644 --- a/garnet/lib/magma/gnbuild/magma-intel-gen/BUILD.gn +++ b/garnet/lib/magma/gnbuild/magma-intel-gen/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config.gni") import("//build/package.gni") import("//build/test/test_package.gni") import("//garnet/lib/magma/gnbuild/magma.gni") @@ -18,24 +19,6 @@ if (target_cpu == "x64") { "//third_party/mesa:magma_vulkan", ] - # api_version must be present but is unused - icd_data = [ - "{", - "\"file_format_version\": \"1.0.0\",", - "\"ICD\": {", - "\"library_path\": \"libvulkan_intel.so\",", - "\"api_version\": \"0.0.0\"", - "}", - "}", - ] - write_file("$target_gen_dir/vulkan/icd.d/libvulkan_intel.json", icd_data) - - resources = [ - { - path = rebase_path("$target_gen_dir/vulkan/icd.d/libvulkan_intel.json") - dest = "vulkan/icd.d/libvulkan_intel.json" - }, - ] libraries = [ { name = "libvulkan_intel.so" @@ -59,6 +42,28 @@ if (target_cpu == "x64") { } } + config_data("magma-intel-gen-config") { + # api_version must be present but is unused + icd_data = [ + "{", + "\"file_format_version\": \"1.0.0\",", + "\"ICD\": {", + "\"library_path\": \"libvulkan_intel.so\",", + "\"api_version\": \"0.0.0\"", + "}", + "}", + ] + write_file("$target_gen_dir/vulkan/icd.d/libvulkan_intel.json", icd_data) + + for_pkg = "vulkan-icd" + sources = [ + rebase_path("$target_gen_dir/vulkan/icd.d/libvulkan_intel.json"), + ] + outputs = [ + "icd.d/libvulkan_intel.json", + ] + } + test_package("magma_intel_gen_nonhardware_tests") { deps = [ "$msd_intel_gen_build_root:tests", diff --git a/garnet/packages/prod/BUILD.gn b/garnet/packages/prod/BUILD.gn index 07dfa425314e4d9e989eca2f543ab0956b21b0e2..fd2b01dd08f7305506f4c047c7d9f8dfb623c7ec 100644 --- a/garnet/packages/prod/BUILD.gn +++ b/garnet/packages/prod/BUILD.gn @@ -1087,6 +1087,7 @@ if (target_cpu == "x64") { testonly = true public_deps = [ "//garnet/lib/magma/gnbuild/magma-intel-gen", + "//garnet/lib/magma/gnbuild/magma-intel-gen:magma-intel-gen-config", "//garnet/packages/prod:sysmem_connector", ] }