From 0d66bf3c8316b4d6d1fa87d2a5550bd2aba5a021 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Fri, 16 Aug 2024 18:32:39 -0700 Subject: [PATCH] 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 Acked-by: Yonggang Luo Acked-by: Adam Jackson Part-of: --- .../guest/GoldfishAddressSpace/meson.build | 4 ++-- src/gfxstream/guest/platform/kumquat/meson.build | 12 ++++++------ src/gfxstream/guest/platform/linux/meson.build | 10 +++++----- src/gfxstream/guest/platform/meson.build | 14 +++++++------- src/gfxstream/guest/vulkan/meson.build | 6 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/gfxstream/guest/GoldfishAddressSpace/meson.build b/src/gfxstream/guest/GoldfishAddressSpace/meson.build index 570f5358a7f..e668a4a0d96 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/meson.build +++ b/src/gfxstream/guest/GoldfishAddressSpace/meson.build @@ -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 ) diff --git a/src/gfxstream/guest/platform/kumquat/meson.build b/src/gfxstream/guest/platform/kumquat/meson.build index 8f0c191ef6b..b390e495f33 100644 --- a/src/gfxstream/guest/platform/kumquat/meson.build +++ b/src/gfxstream/guest/platform/kumquat/meson.build @@ -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, ) diff --git a/src/gfxstream/guest/platform/linux/meson.build b/src/gfxstream/guest/platform/linux/meson.build index 7dbabe89499..e1492807d70 100644 --- a/src/gfxstream/guest/platform/linux/meson.build +++ b/src/gfxstream/guest/platform/linux/meson.build @@ -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, ) diff --git a/src/gfxstream/guest/platform/meson.build b/src/gfxstream/guest/platform/meson.build index d99b881a517..5e4019deb70 100644 --- a/src/gfxstream/guest/platform/meson.build +++ b/src/gfxstream/guest/platform/meson.build @@ -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] ) diff --git a/src/gfxstream/guest/vulkan/meson.build b/src/gfxstream/guest/vulkan/meson.build index 9055a9cfae3..39a1b020dd3 100644 --- a/src/gfxstream/guest/vulkan/meson.build +++ b/src/gfxstream/guest/vulkan/meson.build @@ -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,