gfxstream: meson format -i {all meson files}

More readable, allows meson format to be used in the future. Acked-by: Eric Engestrom <eric@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38388>
2026-06-15 09:08:20 +02:00 · 2025-11-11 17:37:50 -08:00 · 2025-11-11 17:37:50 -08:00 · 5826a0aad9
commit 5826a0aad9
parent c73c737eb2
12 changed files with 295 additions and 222 deletions
--- a/src/gfxstream/aemu/meson.build
+++ b/src/gfxstream/aemu/meson.build
@ -3,13 +3,6 @@

 inc_aemu = include_directories('include')

-files_libaemu = files(
-  'ring_buffer.cpp',
-  'Stream.cpp',
-)
+files_libaemu = files('Stream.cpp', 'ring_buffer.cpp')

-libaemu = static_library(
-   'aemu',
-   files_libaemu,
-   include_directories: [inc_aemu],
-)
+libaemu = static_library('aemu', files_libaemu, include_directories: [inc_aemu])
--- a/src/gfxstream/guest/GoldfishAddressSpace/meson.build
+++ b/src/gfxstream/guest/GoldfishAddressSpace/meson.build
@ -4,25 +4,27 @@
 inc_goldfish_address_space = include_directories('include')

 files_lib_goldfish_address_space = files(
-  'AddressSpaceStream.cpp',
-  'VirtioGpuAddressSpaceStream.cpp',
+    'AddressSpaceStream.cpp',
+    'VirtioGpuAddressSpaceStream.cpp',
 )

 if host_machine.system() == 'android'
-  files_lib_goldfish_address_space += files('GoldfishAddressSpaceStream.cpp')
-  files_lib_goldfish_address_space += files('goldfish_address_space.cpp')
+    files_lib_goldfish_address_space += files('GoldfishAddressSpaceStream.cpp')
+    files_lib_goldfish_address_space += files('goldfish_address_space.cpp')
 endif

 lib_goldfish_address_space = static_library(
-   'goldfish_address_space',
-   files_lib_goldfish_address_space,
-   cpp_args: gfxstream_guest_args,
-   include_directories: [inc_goldfish_address_space,
-                         inc_guest_iostream,
-                         inc_platform_virtgpu,
-                         inc_include,
-                         inc_aemu,
-                         inc_src],
-   link_with: [libplatform_virtgpu],
-   dependencies: dep_libdrm
+    'goldfish_address_space',
+    files_lib_goldfish_address_space,
+    cpp_args: gfxstream_guest_args,
+    include_directories: [
+        inc_goldfish_address_space,
+        inc_guest_iostream,
+        inc_platform_virtgpu,
+        inc_include,
+        inc_aemu,
+        inc_src,
+    ],
+    link_with: [libplatform_virtgpu],
+    dependencies: dep_libdrm,
 )
--- a/src/gfxstream/guest/connection-manager/meson.build
+++ b/src/gfxstream/guest/connection-manager/meson.build
@ -4,19 +4,25 @@
 inc_connection_manager = include_directories('.')

 files_libconnection_manager = files(
-  'GfxStreamConnectionManager.cpp',
-  'GfxStreamConnection.cpp',
-  'QemuPipeStreamStub.cpp',
-  'VirtioGpuPipeStream.cpp',
+    'GfxStreamConnection.cpp',
+    'GfxStreamConnectionManager.cpp',
+    'QemuPipeStreamStub.cpp',
+    'VirtioGpuPipeStream.cpp',
 )

 libconnection_manager = static_library(
-   'connection_manager',
-   files_libconnection_manager,
-   cpp_args: gfxstream_guest_args,
-   include_directories: [inc_connection_manager, inc_guest_iostream,
-                         inc_guest_iostream, inc_goldfish_address_space,
-                         inc_platform_virtgpu, inc_src, inc_aemu],
-   link_with: [lib_goldfish_address_space, libplatform_virtgpu],
-   dependencies: dep_libdrm
+    'connection_manager',
+    files_libconnection_manager,
+    cpp_args: gfxstream_guest_args,
+    include_directories: [
+        inc_connection_manager,
+        inc_guest_iostream,
+        inc_guest_iostream,
+        inc_goldfish_address_space,
+        inc_platform_virtgpu,
+        inc_src,
+        inc_aemu,
+    ],
+    link_with: [lib_goldfish_address_space, libplatform_virtgpu],
+    dependencies: dep_libdrm,
 )
--- a/src/gfxstream/guest/meson.build
+++ b/src/gfxstream/guest/meson.build
@ -7,7 +7,7 @@

 with_vulkan_icd_dir = get_option('vulkan-icd-dir')
 if with_vulkan_icd_dir == ''
-  with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
+    with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
 endif

 #===============#
@ -17,9 +17,9 @@ gfxstream_guest_args = ['-D_FILE_OFFSET_BITS=64']

 # Our internal guest build
 if host_machine.system() == 'windows'
-  gfxstream_guest_args += '-DWINDOWS_GUEST_BUILD'
+    gfxstream_guest_args += '-DWINDOWS_GUEST_BUILD'
 else
-  gfxstream_guest_args += '-DLINUX_GUEST_BUILD'
+    gfxstream_guest_args += '-DLINUX_GUEST_BUILD'
 endif
 # Include the gfxstream private VkStructureType definitions
 gfxstream_guest_args += '-DVK_GFXSTREAM_STRUCTURE_TYPE_EXT'
--- a/src/gfxstream/guest/platform/drm/meson.build
+++ b/src/gfxstream/guest/platform/drm/meson.build
@ -2,16 +2,16 @@
 # SPDX-License-Identifier: MIT

 files_libplatform_virtgpu_drm = files(
-  'DrmVirtGpuDevice.cpp',
-  'DrmVirtGpuBlobMapping.cpp',
-  'DrmVirtGpuBlob.cpp',
-  'DrmSync.cpp',
+    'DrmSync.cpp',
+    'DrmVirtGpuBlob.cpp',
+    'DrmVirtGpuBlobMapping.cpp',
+    'DrmVirtGpuDevice.cpp',
 )

 libplatform_virtgpu_drm = static_library(
-   'platform_virtgpu_drm',
-   files_libplatform_virtgpu_drm,
-   cpp_args: gfxstream_guest_args,
-   include_directories: [inc_platform_virtgpu, inc_src, inc_include],
-   dependencies: dep_libdrm,
+    'platform_virtgpu_drm',
+    files_libplatform_virtgpu_drm,
+    cpp_args: gfxstream_guest_args,
+    include_directories: [inc_platform_virtgpu, inc_src, inc_include],
+    dependencies: dep_libdrm,
 )
--- a/src/gfxstream/guest/platform/kumquat/meson.build
+++ b/src/gfxstream/guest/platform/kumquat/meson.build
@ -2,24 +2,31 @@
 # SPDX-License-Identifier: MIT

 if with_virtgpu_kumquat
-  subdir('vulkan-mapper')
-  files_libplatform_virtgpu_kumquat = files(
-    'VirtGpuKumquatDevice.cpp',
-    'VirtGpuKumquatBlobMapping.cpp',
-    'VirtGpuKumquatBlob.cpp',
-    'VirtGpuKumquatSync.cpp',
-  )
+    subdir('vulkan-mapper')
+    files_libplatform_virtgpu_kumquat = files(
+        'VirtGpuKumquatBlob.cpp',
+        'VirtGpuKumquatBlobMapping.cpp',
+        'VirtGpuKumquatDevice.cpp',
+        'VirtGpuKumquatSync.cpp',
+    )
 else
-  dep_gfxstream_vulkan_mapper = null_dep
-  files_libplatform_virtgpu_kumquat = files('VirtGpuKumquatStub.cpp')
+    dep_gfxstream_vulkan_mapper = null_dep
+    files_libplatform_virtgpu_kumquat = files('VirtGpuKumquatStub.cpp')
 endif

 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_vulkan_util, inc_include],
-   dependencies: [idep_vulkan_util_headers, dep_virtgpu_kumquat_ffi,
-                  dep_gfxstream_vulkan_mapper],
+    'platform_virtgpu_kumquat',
+    files_libplatform_virtgpu_kumquat,
+    cpp_args: gfxstream_guest_args,
+    include_directories: [
+        inc_platform_virtgpu,
+        inc_src,
+        inc_vulkan_util,
+        inc_include,
+    ],
+    dependencies: [
+        idep_vulkan_util_headers,
+        dep_virtgpu_kumquat_ffi,
+        dep_gfxstream_vulkan_mapper,
+    ],
 )
--- a/src/gfxstream/guest/platform/kumquat/vulkan-mapper/meson.build
+++ b/src/gfxstream/guest/platform/kumquat/vulkan-mapper/meson.build
@ -3,21 +3,27 @@

 inc_gfxstream_vulkan_mapper = include_directories('.')

-files_gfxstream_vulkan_mapper = files(
-  'GfxStreamVulkanMapper.cpp',
-)
+files_gfxstream_vulkan_mapper = files('GfxStreamVulkanMapper.cpp')

 libgfxstream_vulkan_mapper = static_library(
-   'gfxstream_vulkan_mapper',
-   files_gfxstream_vulkan_mapper,
-   cpp_args: gfxstream_guest_args,
-   include_directories: [inc_src, inc_vulkan_util, inc_gfxstream_vulkan_mapper,
-                         inc_include],
-   dependencies: [idep_vulkan_util_headers, idep_vulkan_util,
-                  idep_mesautil, dep_virtgpu_kumquat_ffi],
+    'gfxstream_vulkan_mapper',
+    files_gfxstream_vulkan_mapper,
+    cpp_args: gfxstream_guest_args,
+    include_directories: [
+        inc_src,
+        inc_vulkan_util,
+        inc_gfxstream_vulkan_mapper,
+        inc_include,
+    ],
+    dependencies: [
+        idep_vulkan_util_headers,
+        idep_vulkan_util,
+        idep_mesautil,
+        dep_virtgpu_kumquat_ffi,
+    ],
 )

 dep_gfxstream_vulkan_mapper = declare_dependency(
-  include_directories : [inc_gfxstream_vulkan_mapper],
-  link_with : [libgfxstream_vulkan_mapper]
+    include_directories: [inc_gfxstream_vulkan_mapper],
+    link_with: [libgfxstream_vulkan_mapper],
 )
--- a/src/gfxstream/guest/platform/meson.build
+++ b/src/gfxstream/guest/platform/meson.build
@ -8,21 +8,19 @@ subdir('kumquat')
 libplatform_virtgpu = [libplatform_virtgpu_kumquat]

 if system_has_kms_drm
-  subdir('drm')
-  libplatform_virtgpu += libplatform_virtgpu_drm
+    subdir('drm')
+    libplatform_virtgpu += libplatform_virtgpu_drm
 elif host_machine.system() == 'windows'
-  subdir('windows')
-  libplatform_virtgpu += libplatform_virtgpu_windows
+    subdir('windows')
+    libplatform_virtgpu += libplatform_virtgpu_windows
 endif

-files_libplatform_virtgpu = files(
-  'VirtGpu.cpp',
-)
+files_libplatform_virtgpu = files('VirtGpu.cpp')

 libplatform_virtgpu = static_library(
-   'platform_virtgpu',
-   files_libplatform_virtgpu,
-   cpp_args: gfxstream_guest_args,
-   include_directories: [inc_platform_virtgpu, inc_src],
-   link_with: libplatform_virtgpu
+    'platform_virtgpu',
+    files_libplatform_virtgpu,
+    cpp_args: gfxstream_guest_args,
+    include_directories: [inc_platform_virtgpu, inc_src],
+    link_with: libplatform_virtgpu,
 )
--- a/src/gfxstream/guest/platform/windows/meson.build
+++ b/src/gfxstream/guest/platform/windows/meson.build
@ -2,15 +2,15 @@
 # SPDX-License-Identifier: MIT

 files_libplatform_virtgpu_windows = files(
-  'WindowsVirtGpuDevice.cpp',
-  'WindowsVirtGpuBlobMapping.cpp',
-  'WindowsVirtGpuBlob.cpp',
-  'WindowsSync.cpp',
+    'WindowsSync.cpp',
+    'WindowsVirtGpuBlob.cpp',
+    'WindowsVirtGpuBlobMapping.cpp',
+    'WindowsVirtGpuDevice.cpp',
 )

 libplatform_virtgpu_windows = static_library(
-   'platform_virtgpu_windows',
-   files_libplatform_virtgpu_windows,
-   cpp_args: gfxstream_guest_args,
-   include_directories: [inc_platform_virtgpu, inc_src, inc_include],
+    'platform_virtgpu_windows',
+    files_libplatform_virtgpu_windows,
+    cpp_args: gfxstream_guest_args,
+    include_directories: [inc_platform_virtgpu, inc_src, inc_include],
 )
--- a/src/gfxstream/guest/vulkan/meson.build
+++ b/src/gfxstream/guest/vulkan/meson.build
@ -4,77 +4,108 @@
 subdir('stubs')

 files_lib_vulkan_gfxstream = files(
-  'gfxstream_vk_device.cpp',
-  'gfxstream_vk_cmd.cpp',
-  'gfxstream_vk_wsi.cpp'
+    'gfxstream_vk_cmd.cpp',
+    'gfxstream_vk_device.cpp',
+    'gfxstream_vk_wsi.cpp',
 )

 gfxstream_vk_wsi_args = []
 if with_platform_x11
-   gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_X11'
+    gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_X11'
 endif

 if with_platform_wayland
-   gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_WAYLAND'
+    gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_WAYLAND'
 endif

-gfxstream_deps = [dep_libdrm, idep_vulkan_wsi_headers,
-                  idep_vulkan_lite_runtime, idep_vulkan_util_headers,
-                  idep_vulkan_wsi, dep_valgrind]
+gfxstream_deps = [
+    dep_libdrm,
+    idep_vulkan_wsi_headers,
+    idep_vulkan_lite_runtime,
+    idep_vulkan_util_headers,
+    idep_vulkan_wsi,
+    dep_valgrind,
+]

 if with_perfetto
-  gfxstream_deps += dep_perfetto
+    gfxstream_deps += dep_perfetto
 endif

 lib_vulkan_gfxstream = shared_library(
-   'vulkan_gfxstream',
-   files_lib_vulkan_gfxstream + files_lib_vulkan_enc + gfxstream_vk_entrypoints +
-   gfxstream_guest_vk_autogen + vulkan_gfxstream_h,
-   cpp_args: gfxstream_guest_args + gfxstream_vk_wsi_args,
-   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_aemu,
-                         inc_platform_virtgpu, inc_connection_manager],
-   link_with: [libgfxstream_vk_stubs, libvulkan_wsi, libplatform_virtgpu,
-               libconnection_manager, libaemu],
-   link_args: [vulkan_icd_link_args, ld_args_bsymbolic, ld_args_gc_sections],
-   link_depends: vulkan_icd_link_depends,
-   dependencies: gfxstream_deps,
-   install: true,
+    'vulkan_gfxstream',
+    files_lib_vulkan_gfxstream + files_lib_vulkan_enc + gfxstream_vk_entrypoints + gfxstream_guest_vk_autogen + vulkan_gfxstream_h,
+    cpp_args: gfxstream_guest_args + gfxstream_vk_wsi_args,
+    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_aemu,
+        inc_platform_virtgpu,
+        inc_connection_manager,
+    ],
+    link_with: [
+        libgfxstream_vk_stubs,
+        libvulkan_wsi,
+        libplatform_virtgpu,
+        libconnection_manager,
+        libaemu,
+    ],
+    link_args: [vulkan_icd_link_args, ld_args_bsymbolic, ld_args_gc_sections],
+    link_depends: vulkan_icd_link_depends,
+    dependencies: gfxstream_deps,
+    install: true,
 )

 icd_file_name = libname_prefix + 'vulkan_gfxstream.' + libname_suffix

 gfxstream_icd = custom_target(
-  'gfxstream_vk_icd',
-  input : [vk_icd_gen, vk_api_xml],
-  output : 'gfxstream_vk_icd.@0@.json'.format(host_machine.cpu()),
-  command : [
-    prog_python, '@INPUT0@',
-    '--api-version', '1.1', '--xml', '@INPUT1@',
-    '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', vulkan_icd_lib_path / icd_file_name,
-    '--out', '@OUTPUT@',
-  ],
-  build_by_default : true,
-  install_dir : with_vulkan_icd_dir,
-  install : true,
+    'gfxstream_vk_icd',
+    input: [vk_icd_gen, vk_api_xml],
+    output: 'gfxstream_vk_icd.@0@.json'.format(host_machine.cpu()),
+    command: [
+        prog_python,
+        '@INPUT0@',
+        '--api-version',
+        '1.1',
+        '--xml',
+        '@INPUT1@',
+        '--sizeof-pointer',
+        sizeof_pointer,
+        '--lib-path',
+        vulkan_icd_lib_path / icd_file_name,
+        '--out',
+        '@OUTPUT@',
+    ],
+    build_by_default: true,
+    install_dir: with_vulkan_icd_dir,
+    install: true,
 )

 _dev_icdname = 'gfxstream_vk_devenv_icd.@0@.json'.format(host_machine.cpu())
 _dev_icd = custom_target(
-  'gfxstream_vk_devenv_icd',
-  input : [vk_icd_gen, vk_api_xml],
-  output : _dev_icdname,
-  command : [
-    prog_python, '@INPUT0@',
-    '--api-version', '1.3', '--xml', '@INPUT1@',
-    '--sizeof-pointer', sizeof_pointer,
-    '--lib-path', meson.current_build_dir() / icd_file_name,
-    '--out', '@OUTPUT@',
-  ],
-  build_by_default : true,
+    'gfxstream_vk_devenv_icd',
+    input: [vk_icd_gen, vk_api_xml],
+    output: _dev_icdname,
+    command: [
+        prog_python,
+        '@INPUT0@',
+        '--api-version',
+        '1.3',
+        '--xml',
+        '@INPUT1@',
+        '--sizeof-pointer',
+        sizeof_pointer,
+        '--lib-path',
+        meson.current_build_dir() / icd_file_name,
+        '--out',
+        '@OUTPUT@',
+    ],
+    build_by_default: true,
 )

 devenv.append('VK_DRIVER_FILES', _dev_icd.full_path())
--- a/src/gfxstream/guest/vulkan/stubs/meson.build
+++ b/src/gfxstream/guest/vulkan/stubs/meson.build
@ -2,14 +2,16 @@
 # SPDX-License-Identifier: MIT

 inc_gfxstream_vk_stubs = include_directories('.')
-files_libgfxstream_vk_stubs = files(
-  'GfxStreamRenderControl.cpp',
-)
+files_libgfxstream_vk_stubs = files('GfxStreamRenderControl.cpp')

 libgfxstream_vk_stubs = static_library(
-   'gfxstream_vk_stubs',
-   files_libgfxstream_vk_stubs,
-   cpp_args: gfxstream_guest_args,
-   include_directories: [inc_connection_manager, inc_platform_virtgpu,
-                         inc_guest_iostream, inc_src],
+    'gfxstream_vk_stubs',
+    files_libgfxstream_vk_stubs,
+    cpp_args: gfxstream_guest_args,
+    include_directories: [
+        inc_connection_manager,
+        inc_platform_virtgpu,
+        inc_guest_iostream,
+        inc_src,
+    ],
 )
--- a/src/gfxstream/guest/vulkan_enc/meson.build
+++ b/src/gfxstream/guest/vulkan_enc/meson.build
@ -5,84 +5,112 @@ output_host_path = meson.current_build_dir() + '/host/vulkan/cereal'
 guest_enc_path = meson.current_build_dir()

 if build_machine.system() != 'android'
-  gfxstream_guest_vk_autogen = custom_target(
-      'gfxstream_guest_vk_autogen',
-      output : [
-        'VkEncoder.h',
-        'goldfish_vk_counting_guest.h',
-        'goldfish_vk_deepcopy_guest.h',
-        'goldfish_vk_marshaling_guest.h',
-        'goldfish_vk_extension_structs_guest.h',
-        'goldfish_vk_reserved_marshaling_guest.h',
-        'goldfish_vk_transform_guest.h',
-        'goldfish_vk_counting_guest.cpp',
-        'goldfish_vk_deepcopy_guest.cpp',
-        'goldfish_vk_extension_structs_guest.cpp',
-        'goldfish_vk_marshaling_guest.cpp',
-        'goldfish_vk_reserved_marshaling_guest.cpp',
-        'goldfish_vk_transform_guest.cpp',
-        'VkEncoder.cpp',
-        'func_table.cpp',
-      ],
-      env: {'GFXSTREAM_NO_CLANG_FMT': '1', 'CEREAL_VARIANT' : 'guest',
-            'GFXSTREAM_GUEST_ENCODER_DIR': guest_enc_path},
-      input: [genvk, vk_api_xml, vk_gfxstream_xml],
-      command: [prog_python, '@INPUT0@', '-registry', '@INPUT1@', '-registryGfxstream', '@INPUT2@',
-                'cereal', '-o', output_host_path],
-  )
+    gfxstream_guest_vk_autogen = custom_target(
+        'gfxstream_guest_vk_autogen',
+        output: [
+            'VkEncoder.h',
+            'goldfish_vk_counting_guest.h',
+            'goldfish_vk_deepcopy_guest.h',
+            'goldfish_vk_marshaling_guest.h',
+            'goldfish_vk_extension_structs_guest.h',
+            'goldfish_vk_reserved_marshaling_guest.h',
+            'goldfish_vk_transform_guest.h',
+            'goldfish_vk_counting_guest.cpp',
+            'goldfish_vk_deepcopy_guest.cpp',
+            'goldfish_vk_extension_structs_guest.cpp',
+            'goldfish_vk_marshaling_guest.cpp',
+            'goldfish_vk_reserved_marshaling_guest.cpp',
+            'goldfish_vk_transform_guest.cpp',
+            'VkEncoder.cpp',
+            'func_table.cpp',
+        ],
+        env: {
+            'GFXSTREAM_NO_CLANG_FMT': '1',
+            'CEREAL_VARIANT' : 'guest',
+            'GFXSTREAM_GUEST_ENCODER_DIR': guest_enc_path,
+        },
+        input: [genvk, vk_api_xml, vk_gfxstream_xml],
+        command: [
+            prog_python,
+            '@INPUT0@',
+            '-registry',
+            '@INPUT1@',
+            '-registryGfxstream',
+            '@INPUT2@',
+            'cereal',
+            '-o',
+            output_host_path,
+        ],
+    )

-  vulkan_gfxstream_h = custom_target(
-      'vulkan_gfxstream_header',
-      output : [
-        'vulkan_gfxstream.h',
-      ],
-      env: {'GFXSTREAM_NO_CLANG_FMT': '1', 'CEREAL_VARIANT' : 'guest'},
-      input: [genvk, vk_gfxstream_xml],
-      command: [prog_python, '@INPUT0@', '-registry', '@INPUT1@', 'vulkan_gfxstream.h',
-                '-o', guest_enc_path],
-      )
+    vulkan_gfxstream_h = custom_target(
+        'vulkan_gfxstream_header',
+        output: ['vulkan_gfxstream.h'],
+        env: {'GFXSTREAM_NO_CLANG_FMT': '1', 'CEREAL_VARIANT' : 'guest'},
+        input: [genvk, vk_gfxstream_xml],
+        command: [
+            prog_python,
+            '@INPUT0@',
+            '-registry',
+            '@INPUT1@',
+            'vulkan_gfxstream.h',
+            '-o',
+            guest_enc_path,
+        ],
+    )
 else
-  gfxstream_guest_vk_autogen = files(
-        'VkEncoder.h',
-        'goldfish_vk_counting_guest.h',
-        'goldfish_vk_deepcopy_guest.h',
-        'goldfish_vk_marshaling_guest.h',
-        'goldfish_vk_extension_structs_guest.h',
-        'goldfish_vk_reserved_marshaling_guest.h',
-        'goldfish_vk_transform_guest.h',
-        'goldfish_vk_counting_guest.cpp',
-        'goldfish_vk_deepcopy_guest.cpp',
-        'goldfish_vk_extension_structs_guest.cpp',
-        'goldfish_vk_marshaling_guest.cpp',
-        'goldfish_vk_reserved_marshaling_guest.cpp',
-        'goldfish_vk_transform_guest.cpp',
+    gfxstream_guest_vk_autogen = files(
        'VkEncoder.cpp',
-        'func_table.cpp'
-  )
+        'VkEncoder.h',
+        'func_table.cpp',
+        'goldfish_vk_counting_guest.cpp',
+        'goldfish_vk_counting_guest.h',
+        'goldfish_vk_deepcopy_guest.cpp',
+        'goldfish_vk_deepcopy_guest.h',
+        'goldfish_vk_extension_structs_guest.cpp',
+        'goldfish_vk_extension_structs_guest.h',
+        'goldfish_vk_marshaling_guest.cpp',
+        'goldfish_vk_marshaling_guest.h',
+        'goldfish_vk_reserved_marshaling_guest.cpp',
+        'goldfish_vk_reserved_marshaling_guest.h',
+        'goldfish_vk_transform_guest.cpp',
+        'goldfish_vk_transform_guest.h',
+    )

-  vulkan_gfxstream_h = files('vulkan_gfxstream.h')
+    vulkan_gfxstream_h = files('vulkan_gfxstream.h')
 endif

 gfxstream_vk_entrypoints = custom_target(
-  'gfxstream_vk_entrypoints',
-  input : [vk_entrypoints_gen, vk_api_xml],
-  output : ['gfxstream_vk_entrypoints.h', 'gfxstream_vk_entrypoints.c'],
-  command : [
-    prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--proto', '--weak',
-    '--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@', '--prefix', 'gfxstream_vk',
-    '--beta', with_vulkan_beta.to_string()
-  ],
+    'gfxstream_vk_entrypoints',
+    input: [vk_entrypoints_gen, vk_api_xml],
+    output: ['gfxstream_vk_entrypoints.h', 'gfxstream_vk_entrypoints.c'],
+    command: [
+        prog_python,
+        '@INPUT0@',
+        '--xml',
+        '@INPUT1@',
+        '--proto',
+        '--weak',
+        '--out-h',
+        '@OUTPUT0@',
+        '--out-c',
+        '@OUTPUT1@',
+        '--prefix',
+        'gfxstream_vk',
+        '--beta',
+        with_vulkan_beta.to_string(),
+    ],
 )

 files_lib_vulkan_enc = files(
-  'CommandBufferStagingStream.cpp',
-  'DescriptorSetVirtualization.cpp',
-  'HostVisibleMemoryVirtualization.cpp',
-  'ResourceTracker.cpp',
-  'Resources.cpp',
-  'Validation.cpp',
-  'VulkanHandleMapping.cpp',
-  'VulkanStreamGuest.cpp',
-  'gfxstream_vk_private.cpp',
-  'GfxStreamVulkanConnection.cpp',
+    'CommandBufferStagingStream.cpp',
+    'DescriptorSetVirtualization.cpp',
+    'GfxStreamVulkanConnection.cpp',
+    'HostVisibleMemoryVirtualization.cpp',
+    'ResourceTracker.cpp',
+    'Resources.cpp',
+    'Validation.cpp',
+    'VulkanHandleMapping.cpp',
+    'VulkanStreamGuest.cpp',
+    'gfxstream_vk_private.cpp',
 ) + sha1_h