gfxstream: guest: add virtgpu suffix
"libplatform" is too vague.
find ./ -type f -exec sed -i -e 's/lib_platform/libplatform_virtgpu/g' {} \
find ./ -type f -exec sed -i -e 's/inc_platform/inc_platform_virtgpu/g' {} \
essentially.
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:
committed by
Marge Bot
parent
409a40e099
commit
0d66bf3c83
@@ -20,9 +20,9 @@ lib_goldfish_address_space = static_library(
|
||||
inc_guest_iostream,
|
||||
inc_system,
|
||||
inc_opengl_codec,
|
||||
inc_platform,
|
||||
inc_platform_virtgpu,
|
||||
inc_include,
|
||||
inc_src],
|
||||
link_with: [lib_platform],
|
||||
link_with: [libplatform_virtgpu],
|
||||
dependencies: drm_dep
|
||||
)
|
||||
|
||||
@@ -2,20 +2,20 @@
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
if with_kumquat
|
||||
files_lib_platform_kumquat = files(
|
||||
files_libplatform_virtgpu_kumquat = files(
|
||||
'VirtGpuKumquatDevice.cpp',
|
||||
'VirtGpuKumquatBlobMapping.cpp',
|
||||
'VirtGpuKumquatBlob.cpp',
|
||||
'VirtGpuKumquatSync.cpp',
|
||||
)
|
||||
else
|
||||
files_lib_platform_kumquat = files('VirtGpuKumquatStub.cpp')
|
||||
files_libplatform_virtgpu_kumquat = files('VirtGpuKumquatStub.cpp')
|
||||
endif
|
||||
|
||||
lib_platform_kumquat = static_library(
|
||||
'platform_kumquat',
|
||||
files_lib_platform_kumquat,
|
||||
libplatform_virtgpu_kumquat = static_library(
|
||||
'platform_virtgpu_kumquat',
|
||||
files_libplatform_virtgpu_kumquat,
|
||||
cpp_args: gfxstream_guest_args,
|
||||
include_directories: [inc_platform, inc_src, inc_android_compat],
|
||||
include_directories: [inc_platform_virtgpu, inc_src, inc_android_compat],
|
||||
dependencies: virtgpu_kumquat_dep,
|
||||
)
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
# Copyright 2022 Android Open Source Project
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
files_lib_platform_linux = files(
|
||||
files_libplatform_virtgpu_linux = files(
|
||||
'LinuxVirtGpuDevice.cpp',
|
||||
'LinuxVirtGpuBlobMapping.cpp',
|
||||
'LinuxVirtGpuBlob.cpp',
|
||||
'LinuxSync.cpp',
|
||||
)
|
||||
|
||||
lib_platform_linux = static_library(
|
||||
'platform_linux',
|
||||
files_lib_platform_linux,
|
||||
libplatform_virtgpu_linux = static_library(
|
||||
'platform_virtgpu_linux',
|
||||
files_libplatform_virtgpu_linux,
|
||||
cpp_args: gfxstream_guest_args,
|
||||
include_directories: [inc_platform, inc_src, inc_android_compat],
|
||||
include_directories: [inc_platform_virtgpu, inc_src, inc_android_compat],
|
||||
dependencies: drm_dep,
|
||||
)
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
# Copyright 2022 Android Open Source Project
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
inc_platform = include_directories('include')
|
||||
inc_platform_virtgpu = include_directories('include')
|
||||
|
||||
subdir('kumquat')
|
||||
subdir('linux')
|
||||
|
||||
files_lib_platform = files(
|
||||
files_libplatform_virtgpu = files(
|
||||
'VirtGpu.cpp',
|
||||
)
|
||||
|
||||
lib_platform = static_library(
|
||||
'platform',
|
||||
files_lib_platform,
|
||||
libplatform_virtgpu = static_library(
|
||||
'platform_virtgpu',
|
||||
files_libplatform_virtgpu,
|
||||
cpp_args: gfxstream_guest_args,
|
||||
include_directories: [inc_platform, inc_src, inc_android_compat],
|
||||
link_with: [lib_platform_kumquat, lib_platform_linux]
|
||||
include_directories: [inc_platform_virtgpu, inc_src, inc_android_compat],
|
||||
link_with: [libplatform_virtgpu_kumquat, libplatform_virtgpu_linux]
|
||||
)
|
||||
|
||||
@@ -22,11 +22,11 @@ lib_vulkan_gfxstream = shared_library(
|
||||
cpp_args: gfxstream_guest_args + gfxstream_vk_wsi_args,
|
||||
include_directories: [inc_vulkan_headers, inc_opengl_headers, inc_android_emu,
|
||||
inc_android_compat, inc_opengl_system, inc_guest_iostream,
|
||||
inc_opengl_codec, inc_render_enc, inc_vulkan_enc, inc_platform,
|
||||
inc_opengl_codec, inc_render_enc, inc_vulkan_enc, inc_platform_virtgpu,
|
||||
inc_goldfish_address_space, inc_system, inc_include, inc_src,
|
||||
inc_platform, inc_codec_common],
|
||||
inc_platform_virtgpu, inc_codec_common],
|
||||
link_with: [lib_android_compat, lib_emu_android_base, lib_stream,
|
||||
libvulkan_wsi, lib_platform],
|
||||
libvulkan_wsi, libplatform_virtgpu],
|
||||
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,
|
||||
|
||||
Reference in New Issue
Block a user