From 7508257d72ced539c57f4a42a75a8daf6da024b1 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Fri, 30 Aug 2024 12:52:17 -0700 Subject: [PATCH] gfxstream: guest: nuke android_compat directory With the requirement for the Android compatibility layer lifted, we can nuke many things in "fuchsia" directory (which was also used for guest Linux builds). Things that might be useful later are kept, but should probably be ported to Mesa's util layer. Reviewed-by: Aaron Ruby Acked-by: Yonggang Luo Acked-by: Adam Jackson Part-of: --- .../guest/GoldfishAddressSpace/meson.build | 3 +-- src/gfxstream/guest/platform/kumquat/meson.build | 2 +- src/gfxstream/guest/platform/linux/meson.build | 3 +-- src/gfxstream/guest/platform/meson.build | 2 +- src/gfxstream/guest/vulkan/meson.build | 15 +++++++-------- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/gfxstream/guest/GoldfishAddressSpace/meson.build b/src/gfxstream/guest/GoldfishAddressSpace/meson.build index 52be724b7db..f906fac7821 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/meson.build +++ b/src/gfxstream/guest/GoldfishAddressSpace/meson.build @@ -14,8 +14,7 @@ lib_goldfish_address_space = static_library( 'goldfish_address_space', files_lib_goldfish_address_space, cpp_args: gfxstream_guest_args, - include_directories: [inc_android_compat, - inc_goldfish_address_space, + include_directories: [inc_goldfish_address_space, inc_guest_iostream, inc_platform_virtgpu, inc_include, diff --git a/src/gfxstream/guest/platform/kumquat/meson.build b/src/gfxstream/guest/platform/kumquat/meson.build index b390e495f33..544eaf83bee 100644 --- a/src/gfxstream/guest/platform/kumquat/meson.build +++ b/src/gfxstream/guest/platform/kumquat/meson.build @@ -16,6 +16,6 @@ libplatform_virtgpu_kumquat = static_library( 'platform_virtgpu_kumquat', files_libplatform_virtgpu_kumquat, cpp_args: gfxstream_guest_args, - include_directories: [inc_platform_virtgpu, inc_src, inc_android_compat], + include_directories: [inc_platform_virtgpu, inc_src], dependencies: virtgpu_kumquat_dep, ) diff --git a/src/gfxstream/guest/platform/linux/meson.build b/src/gfxstream/guest/platform/linux/meson.build index 157f4853956..ccca7573eb4 100644 --- a/src/gfxstream/guest/platform/linux/meson.build +++ b/src/gfxstream/guest/platform/linux/meson.build @@ -12,7 +12,6 @@ libplatform_virtgpu_linux = static_library( 'platform_virtgpu_linux', files_libplatform_virtgpu_linux, cpp_args: gfxstream_guest_args, - include_directories: [inc_platform_virtgpu, inc_src, inc_include, - inc_android_compat], + include_directories: [inc_platform_virtgpu, inc_src, inc_include], dependencies: drm_dep, ) diff --git a/src/gfxstream/guest/platform/meson.build b/src/gfxstream/guest/platform/meson.build index 5e4019deb70..3fad031dd6b 100644 --- a/src/gfxstream/guest/platform/meson.build +++ b/src/gfxstream/guest/platform/meson.build @@ -14,6 +14,6 @@ libplatform_virtgpu = static_library( 'platform_virtgpu', files_libplatform_virtgpu, cpp_args: gfxstream_guest_args, - include_directories: [inc_platform_virtgpu, inc_src, inc_android_compat], + include_directories: [inc_platform_virtgpu, inc_src], link_with: [libplatform_virtgpu_kumquat, libplatform_virtgpu_linux] ) diff --git a/src/gfxstream/guest/vulkan/meson.build b/src/gfxstream/guest/vulkan/meson.build index 0b53ceb3f60..88a681d4f8c 100644 --- a/src/gfxstream/guest/vulkan/meson.build +++ b/src/gfxstream/guest/vulkan/meson.build @@ -22,14 +22,13 @@ lib_vulkan_gfxstream = shared_library( 'vulkan_gfxstream', files_lib_vulkan_gfxstream + files_lib_vulkan_enc + gfxstream_vk_entrypoints, cpp_args: gfxstream_guest_args + gfxstream_vk_wsi_args, - include_directories: [inc_vulkan_headers, inc_android_compat, - inc_guest_iostream, inc_vulkan_enc, - inc_platform_virtgpu, inc_gfxstream_vk_stubs, - inc_goldfish_address_space, inc_include, - inc_src, inc_platform_virtgpu, - inc_connection_manager], - link_with: [lib_android_compat, libgfxstream_vk_stubs, - libvulkan_wsi, libplatform_virtgpu, libconnection_manager], + include_directories: [inc_vulkan_headers, inc_guest_iostream, + inc_vulkan_enc, inc_platform_virtgpu, + inc_gfxstream_vk_stubs, inc_goldfish_address_space, + inc_include, inc_src, + inc_platform_virtgpu, inc_connection_manager], + link_with: [libgfxstream_vk_stubs, libvulkan_wsi, libplatform_virtgpu, + libconnection_manager], link_args: [vulkan_icd_link_args, ld_args_bsymbolic, ld_args_gc_sections], link_depends: vulkan_icd_link_depends, dependencies: [dependency('libdrm'), idep_vulkan_wsi_headers,