OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gfxstream: guest: nuke android_compat directory

Browse Source 
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 <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
This commit is contained in:
Gurchetan Singh
2024-08-30 12:52:17 -07:00
committed by Marge Bot
parent 876202f90c
commit 7508257d72
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gfxstream/guest/GoldfishAddressSpace/meson.build
View File

@@ -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,

2
src/gfxstream/guest/platform/kumquat/meson.build
View File

@@ -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,
)

3
src/gfxstream/guest/platform/linux/meson.build
View File

@@ -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,
)

2
src/gfxstream/guest/platform/meson.build
View File

@@ -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]
)

15
src/gfxstream/guest/vulkan/meson.build
View File

@@ -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,