Prepare for move to hardware/google/gfxstream

Move codegen into what will become
hardware/google/gfxstream/codegen/vulkan
and move generated vulkan headers into what will become
hardware/google/gfxstream/common/vulkan.

Bug: 271464937
Test: presubmit
Test: python android/build/python/cmake.py --gfxstream
Change-Id: Ie0465ac72b4a2f7444b595cd1421e2e3cb1d0997

171 files changed, 19 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 5ef59a00..dac09de4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,13 +15,3 @@ license {
         "LICENSE",
     ],
 }
-
-cc_library_headers {
-    name: "gfxstream_vulkan_headers",
-    export_include_dirs: ["include/vulkan/include"],
-    host_supported: true,
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.virt",
-    ],
-}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f40bec4..79f15d77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,4 @@
 project(gfxstream-protocols)
 cmake_minimum_required(VERSION 3.11)
 
-add_library(gfxstream_vulkan_headers INTERFACE)
-target_include_directories(
-    gfxstream_vulkan_headers
-    INTERFACE include/vulkan/include)
+add_subdirectory(common)
\ No newline at end of file
diff --git a/scripts/generate-vulkan-sources.sh b/codegen/scripts/generate-vulkan-sources.sh
index edb476d4..3f3da706 100755
--- a/scripts/generate-vulkan-sources.sh
+++ b/codegen/scripts/generate-vulkan-sources.sh
@@ -26,11 +26,11 @@ then
     AOSP_DIR=$(pwd)/../..
     export GOLDFISH_OPENGL_DIR=$AOSP_DIR/device/generic/goldfish-opengl
     export VULKAN_CEREAL_DIR=$AOSP_DIR/device/generic/vulkan-cereal
-    export VULKAN_REGISTRY_DIR=$AOSP_DIR/external/gfxstream-protocols/registry/vulkan
+    export VULKAN_REGISTRY_DIR=$AOSP_DIR/external/gfxstream-protocols/codegen/vulkan
 else
     export GOLDFISH_OPENGL_DIR=$1
     export VULKAN_CEREAL_DIR=$2
-    export VULKAN_REGISTRY_DIR=registry/vulkan
+    export VULKAN_REGISTRY_DIR=codegen/vulkan
 fi
 
 # Detect clang-format
@@ -40,7 +40,7 @@ if ! $WHICH clang-format > /dev/null; then
 fi
 
 # Generate Vulkan headers
-VULKAN_HEADERS_ROOT=$PROJECT_ROOT/include/vulkan
+VULKAN_HEADERS_ROOT=$PROJECT_ROOT/common/vulkan
 rm -rf $VULKAN_HEADERS_ROOT && mkdir -p $VULKAN_HEADERS_ROOT
 if [ $? -ne 0 ]; then
     echo "Failed to clear the old Vulkan headers." 1>&2
diff --git a/registry/vulkan/BUILD.adoc b/codegen/vulkan/BUILD.adoc
index 855b7d33..855b7d33 100644
--- a/registry/vulkan/BUILD.adoc
+++ b/codegen/vulkan/BUILD.adoc
diff --git a/registry/vulkan/CODE_OF_CONDUCT.adoc b/codegen/vulkan/CODE_OF_CONDUCT.adoc
index d8c25465..d8c25465 100644
--- a/registry/vulkan/CODE_OF_CONDUCT.adoc
+++ b/codegen/vulkan/CODE_OF_CONDUCT.adoc
diff --git a/registry/vulkan/CONTRIBUTING.adoc b/codegen/vulkan/CONTRIBUTING.adoc
index 9551984a..9551984a 100644
--- a/registry/vulkan/CONTRIBUTING.adoc
+++ b/codegen/vulkan/CONTRIBUTING.adoc
diff --git a/registry/vulkan/COPYING.adoc b/codegen/vulkan/COPYING.adoc
index 8aafada3..8aafada3 100644
--- a/registry/vulkan/COPYING.adoc
+++ b/codegen/vulkan/COPYING.adoc
diff --git a/registry/vulkan/ChangeLog.txt b/codegen/vulkan/ChangeLog.txt
index aecdfa01..aecdfa01 100644
--- a/registry/vulkan/ChangeLog.txt
+++ b/codegen/vulkan/ChangeLog.txt
diff --git a/registry/vulkan/LICENSE.adoc b/codegen/vulkan/LICENSE.adoc
index cb7c4042..cb7c4042 100644
--- a/registry/vulkan/LICENSE.adoc
+++ b/codegen/vulkan/LICENSE.adoc
diff --git a/registry/vulkan/LICENSES/Apache-2.0.txt b/codegen/vulkan/LICENSES/Apache-2.0.txt
index 4ed90b95..4ed90b95 100644
--- a/registry/vulkan/LICENSES/Apache-2.0.txt
+++ b/codegen/vulkan/LICENSES/Apache-2.0.txt
diff --git a/registry/vulkan/LICENSES/CC-BY-4.0.txt b/codegen/vulkan/LICENSES/CC-BY-4.0.txt
index 3f92dfc5..3f92dfc5 100644
--- a/registry/vulkan/LICENSES/CC-BY-4.0.txt
+++ b/codegen/vulkan/LICENSES/CC-BY-4.0.txt
diff --git a/registry/vulkan/LICENSES/LicenseRef-KhronosSpecCopyright.txt b/codegen/vulkan/LICENSES/LicenseRef-KhronosSpecCopyright.txt
index a39ec49e..a39ec49e 100644
--- a/registry/vulkan/LICENSES/LicenseRef-KhronosSpecCopyright.txt
+++ b/codegen/vulkan/LICENSES/LicenseRef-KhronosSpecCopyright.txt
diff --git a/registry/vulkan/LICENSES/LicenseRef-MPLUS.txt b/codegen/vulkan/LICENSES/LicenseRef-MPLUS.txt
index 9db1dd87..9db1dd87 100644
--- a/registry/vulkan/LICENSES/LicenseRef-MPLUS.txt
+++ b/codegen/vulkan/LICENSES/LicenseRef-MPLUS.txt
diff --git a/registry/vulkan/LICENSES/MIT.txt b/codegen/vulkan/LICENSES/MIT.txt
index 204b93da..204b93da 100644
--- a/registry/vulkan/LICENSES/MIT.txt
+++ b/codegen/vulkan/LICENSES/MIT.txt
diff --git a/registry/vulkan/Makefile b/codegen/vulkan/Makefile
index b6a5eaf7..b6a5eaf7 100644
--- a/registry/vulkan/Makefile
+++ b/codegen/vulkan/Makefile
diff --git a/registry/vulkan/README.adoc b/codegen/vulkan/README.adoc
index 6826917a..6826917a 100644
--- a/registry/vulkan/README.adoc
+++ b/codegen/vulkan/README.adoc
diff --git a/registry/vulkan/copyright-spec.txt b/codegen/vulkan/copyright-spec.txt
index a39ec49e..a39ec49e 100644
--- a/registry/vulkan/copyright-spec.txt
+++ b/codegen/vulkan/copyright-spec.txt
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std.h
index 3338fe14..3338fe14 100644
--- a/include/vulkan/include/vk_video/vulkan_video_codec_h264std.h
+++ b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
index cb0d1df5..cb0d1df5 100644
--- a/include/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
+++ b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
index f3a0d3ad..f3a0d3ad 100644
--- a/include/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
+++ b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std.h
index 179c6b70..179c6b70 100644
--- a/include/vulkan/include/vk_video/vulkan_video_codec_h265std.h
+++ b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
index a1efa055..a1efa055 100644
--- a/include/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
+++ b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
index ffffef20..ffffef20 100644
--- a/include/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
+++ b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codecs_common.h b/codegen/vulkan/include/vk_video/vulkan_video_codecs_common.h
index 8cc227a6..8cc227a6 100644
--- a/include/vulkan/include/vk_video/vulkan_video_codecs_common.h
+++ b/codegen/vulkan/include/vk_video/vulkan_video_codecs_common.h
diff --git a/include/vulkan/include/vulkan/vk_platform.h b/codegen/vulkan/include/vulkan/vk_platform.h
index 18b913ab..18b913ab 100644
--- a/include/vulkan/include/vulkan/vk_platform.h
+++ b/codegen/vulkan/include/vulkan/vk_platform.h
diff --git a/include/vulkan/include/vulkan/vulkan.h b/codegen/vulkan/include/vulkan/vulkan.h
index 3f7cdba5..3f7cdba5 100644
--- a/include/vulkan/include/vulkan/vulkan.h
+++ b/codegen/vulkan/include/vulkan/vulkan.h
diff --git a/registry/vulkan/package-lock.json b/codegen/vulkan/package-lock.json
index ead9d523..ead9d523 100644
--- a/registry/vulkan/package-lock.json
+++ b/codegen/vulkan/package-lock.json
diff --git a/registry/vulkan/package.json b/codegen/vulkan/package.json
index 9aa37e16..9aa37e16 100644
--- a/registry/vulkan/package.json
+++ b/codegen/vulkan/package.json
diff --git a/registry/vulkan/registry.txt b/codegen/vulkan/registry.txt
index baa49141..baa49141 100644
--- a/registry/vulkan/registry.txt
+++ b/codegen/vulkan/registry.txt
diff --git a/registry/vulkan/scripts/README.adoc b/codegen/vulkan/scripts/README.adoc
index 0a60629a..0a60629a 100644
--- a/registry/vulkan/scripts/README.adoc
+++ b/codegen/vulkan/scripts/README.adoc
diff --git a/registry/vulkan/scripts/Retired/checkLinks.py b/codegen/vulkan/scripts/Retired/checkLinks.py
index 35103a80..35103a80 100755
--- a/registry/vulkan/scripts/Retired/checkLinks.py
+++ b/codegen/vulkan/scripts/Retired/checkLinks.py
diff --git a/registry/vulkan/scripts/Retired/extensionStubSource.py b/codegen/vulkan/scripts/Retired/extensionStubSource.py
index b9ff837e..b9ff837e 100644
--- a/registry/vulkan/scripts/Retired/extensionStubSource.py
+++ b/codegen/vulkan/scripts/Retired/extensionStubSource.py
diff --git a/registry/vulkan/scripts/Retired/findBalance.py b/codegen/vulkan/scripts/Retired/findBalance.py
index 2a9efe1f..2a9efe1f 100755
--- a/registry/vulkan/scripts/Retired/findBalance.py
+++ b/codegen/vulkan/scripts/Retired/findBalance.py
diff --git a/registry/vulkan/scripts/Retired/fixupRef.py b/codegen/vulkan/scripts/Retired/fixupRef.py
index 4a9b792a..4a9b792a 100755
--- a/registry/vulkan/scripts/Retired/fixupRef.py
+++ b/codegen/vulkan/scripts/Retired/fixupRef.py
diff --git a/registry/vulkan/scripts/Retired/insertTags.py b/codegen/vulkan/scripts/Retired/insertTags.py
index a8c494c1..a8c494c1 100755
--- a/registry/vulkan/scripts/Retired/insertTags.py
+++ b/codegen/vulkan/scripts/Retired/insertTags.py
diff --git a/registry/vulkan/scripts/Retired/realign.py b/codegen/vulkan/scripts/Retired/realign.py
index c2780d4c..c2780d4c 100755
--- a/registry/vulkan/scripts/Retired/realign.py
+++ b/codegen/vulkan/scripts/Retired/realign.py
diff --git a/registry/vulkan/scripts/Retired/refDesc.py b/codegen/vulkan/scripts/Retired/refDesc.py
index be05a4bb..be05a4bb 100644
--- a/registry/vulkan/scripts/Retired/refDesc.py
+++ b/codegen/vulkan/scripts/Retired/refDesc.py
diff --git a/registry/vulkan/scripts/__init__.py.docs b/codegen/vulkan/scripts/__init__.py.docs
index e4c30759..e4c30759 100644
--- a/registry/vulkan/scripts/__init__.py.docs
+++ b/codegen/vulkan/scripts/__init__.py.docs
diff --git a/registry/vulkan/scripts/asciidoctor-chunker/LICENSE b/codegen/vulkan/scripts/asciidoctor-chunker/LICENSE
index ab602974..ab602974 100644
--- a/registry/vulkan/scripts/asciidoctor-chunker/LICENSE
+++ b/codegen/vulkan/scripts/asciidoctor-chunker/LICENSE
diff --git a/registry/vulkan/scripts/asciidoctor-chunker/README.md b/codegen/vulkan/scripts/asciidoctor-chunker/README.md
index 022c8f1c..022c8f1c 100644
--- a/registry/vulkan/scripts/asciidoctor-chunker/README.md
+++ b/codegen/vulkan/scripts/asciidoctor-chunker/README.md
diff --git a/registry/vulkan/scripts/asciidoctor-chunker/asciidoctor-chunker.js b/codegen/vulkan/scripts/asciidoctor-chunker/asciidoctor-chunker.js
index dd35f4e9..dd35f4e9 100755
--- a/registry/vulkan/scripts/asciidoctor-chunker/asciidoctor-chunker.js
+++ b/codegen/vulkan/scripts/asciidoctor-chunker/asciidoctor-chunker.js
diff --git a/registry/vulkan/scripts/cereal/__init__.py b/codegen/vulkan/scripts/cereal/__init__.py
index 1966572f..1966572f 100644
--- a/registry/vulkan/scripts/cereal/__init__.py
+++ b/codegen/vulkan/scripts/cereal/__init__.py
diff --git a/registry/vulkan/scripts/cereal/api_log_decoder.py b/codegen/vulkan/scripts/cereal/api_log_decoder.py
index 97930f5f..97930f5f 100644
--- a/registry/vulkan/scripts/cereal/api_log_decoder.py
+++ b/codegen/vulkan/scripts/cereal/api_log_decoder.py
diff --git a/registry/vulkan/scripts/cereal/common/__init__.py b/codegen/vulkan/scripts/cereal/common/__init__.py
index dd6cdc99..dd6cdc99 100644
--- a/registry/vulkan/scripts/cereal/common/__init__.py
+++ b/codegen/vulkan/scripts/cereal/common/__init__.py
diff --git a/registry/vulkan/scripts/cereal/common/codegen.py b/codegen/vulkan/scripts/cereal/common/codegen.py
index b6b8a6b3..b6b8a6b3 100644
--- a/registry/vulkan/scripts/cereal/common/codegen.py
+++ b/codegen/vulkan/scripts/cereal/common/codegen.py
diff --git a/registry/vulkan/scripts/cereal/common/vulkantypes.py b/codegen/vulkan/scripts/cereal/common/vulkantypes.py
index dc3a9072..dc3a9072 100644
--- a/registry/vulkan/scripts/cereal/common/vulkantypes.py
+++ b/codegen/vulkan/scripts/cereal/common/vulkantypes.py
diff --git a/registry/vulkan/scripts/cereal/counting.py b/codegen/vulkan/scripts/cereal/counting.py
index 0557d328..0557d328 100644
--- a/registry/vulkan/scripts/cereal/counting.py
+++ b/codegen/vulkan/scripts/cereal/counting.py
diff --git a/registry/vulkan/scripts/cereal/decoder.py b/codegen/vulkan/scripts/cereal/decoder.py
index e082db0c..e082db0c 100644
--- a/registry/vulkan/scripts/cereal/decoder.py
+++ b/codegen/vulkan/scripts/cereal/decoder.py
diff --git a/registry/vulkan/scripts/cereal/decodersnapshot.py b/codegen/vulkan/scripts/cereal/decodersnapshot.py
index 4ff97a1d..4ff97a1d 100644
--- a/registry/vulkan/scripts/cereal/decodersnapshot.py
+++ b/codegen/vulkan/scripts/cereal/decodersnapshot.py
diff --git a/registry/vulkan/scripts/cereal/deepcopy.py b/codegen/vulkan/scripts/cereal/deepcopy.py
index 52842e99..52842e99 100644
--- a/registry/vulkan/scripts/cereal/deepcopy.py
+++ b/codegen/vulkan/scripts/cereal/deepcopy.py
diff --git a/registry/vulkan/scripts/cereal/dispatch.py b/codegen/vulkan/scripts/cereal/dispatch.py
index 42cba8ca..42cba8ca 100644
--- a/registry/vulkan/scripts/cereal/dispatch.py
+++ b/codegen/vulkan/scripts/cereal/dispatch.py
diff --git a/registry/vulkan/scripts/cereal/encoder.py b/codegen/vulkan/scripts/cereal/encoder.py
index d3e39745..d3e39745 100644
--- a/registry/vulkan/scripts/cereal/encoder.py
+++ b/codegen/vulkan/scripts/cereal/encoder.py
diff --git a/registry/vulkan/scripts/cereal/extensionstructs.py b/codegen/vulkan/scripts/cereal/extensionstructs.py
index 95c95237..95c95237 100644
--- a/registry/vulkan/scripts/cereal/extensionstructs.py
+++ b/codegen/vulkan/scripts/cereal/extensionstructs.py
diff --git a/registry/vulkan/scripts/cereal/frontend.py b/codegen/vulkan/scripts/cereal/frontend.py
index b182c0e7..b182c0e7 100644
--- a/registry/vulkan/scripts/cereal/frontend.py
+++ b/codegen/vulkan/scripts/cereal/frontend.py
diff --git a/registry/vulkan/scripts/cereal/functable.py b/codegen/vulkan/scripts/cereal/functable.py
index f16735a3..f16735a3 100644
--- a/registry/vulkan/scripts/cereal/functable.py
+++ b/codegen/vulkan/scripts/cereal/functable.py
diff --git a/registry/vulkan/scripts/cereal/handlemap.py b/codegen/vulkan/scripts/cereal/handlemap.py
index 6360e37e..6360e37e 100644
--- a/registry/vulkan/scripts/cereal/handlemap.py
+++ b/codegen/vulkan/scripts/cereal/handlemap.py
diff --git a/registry/vulkan/scripts/cereal/marshaling.py b/codegen/vulkan/scripts/cereal/marshaling.py
index 3427fed7..3427fed7 100644
--- a/registry/vulkan/scripts/cereal/marshaling.py
+++ b/codegen/vulkan/scripts/cereal/marshaling.py
diff --git a/registry/vulkan/scripts/cereal/marshalingdefs.py b/codegen/vulkan/scripts/cereal/marshalingdefs.py
index 88791f68..88791f68 100644
--- a/registry/vulkan/scripts/cereal/marshalingdefs.py
+++ b/codegen/vulkan/scripts/cereal/marshalingdefs.py
diff --git a/registry/vulkan/scripts/cereal/reservedmarshaling.py b/codegen/vulkan/scripts/cereal/reservedmarshaling.py
index 23ace9d3..23ace9d3 100644
--- a/registry/vulkan/scripts/cereal/reservedmarshaling.py
+++ b/codegen/vulkan/scripts/cereal/reservedmarshaling.py
diff --git a/registry/vulkan/scripts/cereal/subdecode.py b/codegen/vulkan/scripts/cereal/subdecode.py
index b77cad77..b77cad77 100644
--- a/registry/vulkan/scripts/cereal/subdecode.py
+++ b/codegen/vulkan/scripts/cereal/subdecode.py
diff --git a/registry/vulkan/scripts/cereal/testing.py b/codegen/vulkan/scripts/cereal/testing.py
index 898532fc..898532fc 100644
--- a/registry/vulkan/scripts/cereal/testing.py
+++ b/codegen/vulkan/scripts/cereal/testing.py
diff --git a/registry/vulkan/scripts/cereal/transform.py b/codegen/vulkan/scripts/cereal/transform.py
index 79aff0e3..79aff0e3 100644
--- a/registry/vulkan/scripts/cereal/transform.py
+++ b/codegen/vulkan/scripts/cereal/transform.py
diff --git a/registry/vulkan/scripts/cereal/unbox.py b/codegen/vulkan/scripts/cereal/unbox.py
index f18fa271..f18fa271 100644
--- a/registry/vulkan/scripts/cereal/unbox.py
+++ b/codegen/vulkan/scripts/cereal/unbox.py
diff --git a/registry/vulkan/scripts/cereal/vkextensionstructuretype.py b/codegen/vulkan/scripts/cereal/vkextensionstructuretype.py
index 8db988ae..8db988ae 100644
--- a/registry/vulkan/scripts/cereal/vkextensionstructuretype.py
+++ b/codegen/vulkan/scripts/cereal/vkextensionstructuretype.py
diff --git a/registry/vulkan/scripts/cereal/wrapperdefs.py b/codegen/vulkan/scripts/cereal/wrapperdefs.py
index 9b969875..9b969875 100644
--- a/registry/vulkan/scripts/cereal/wrapperdefs.py
+++ b/codegen/vulkan/scripts/cereal/wrapperdefs.py
diff --git a/registry/vulkan/scripts/cerealgenerator.py b/codegen/vulkan/scripts/cerealgenerator.py
index 02d7f220..02d7f220 100644
--- a/registry/vulkan/scripts/cerealgenerator.py
+++ b/codegen/vulkan/scripts/cerealgenerator.py
diff --git a/registry/vulkan/scripts/cgenerator.py b/codegen/vulkan/scripts/cgenerator.py
index 56146021..56146021 100644
--- a/registry/vulkan/scripts/cgenerator.py
+++ b/codegen/vulkan/scripts/cgenerator.py
diff --git a/registry/vulkan/scripts/checkXrefs b/codegen/vulkan/scripts/checkXrefs
index 6d5dc7d7..6d5dc7d7 100755
--- a/registry/vulkan/scripts/checkXrefs
+++ b/codegen/vulkan/scripts/checkXrefs
diff --git a/registry/vulkan/scripts/check_html_xrefs.py b/codegen/vulkan/scripts/check_html_xrefs.py
index 0081e6c0..0081e6c0 100755
--- a/registry/vulkan/scripts/check_html_xrefs.py
+++ b/codegen/vulkan/scripts/check_html_xrefs.py
diff --git a/registry/vulkan/scripts/check_spec_links.py b/codegen/vulkan/scripts/check_spec_links.py
index 16cfe438..16cfe438 100755
--- a/registry/vulkan/scripts/check_spec_links.py
+++ b/codegen/vulkan/scripts/check_spec_links.py
diff --git a/registry/vulkan/scripts/ci/check_undefined b/codegen/vulkan/scripts/ci/check_undefined
index b747b1db..b747b1db 100755
--- a/registry/vulkan/scripts/ci/check_undefined
+++ b/codegen/vulkan/scripts/ci/check_undefined
diff --git a/registry/vulkan/scripts/comment_convert.py b/codegen/vulkan/scripts/comment_convert.py
index f1fa938c..f1fa938c 100755
--- a/registry/vulkan/scripts/comment_convert.py
+++ b/codegen/vulkan/scripts/comment_convert.py
diff --git a/registry/vulkan/scripts/compImages.sh b/codegen/vulkan/scripts/compImages.sh
index d9f3670f..d9f3670f 100755
--- a/registry/vulkan/scripts/compImages.sh
+++ b/codegen/vulkan/scripts/compImages.sh
diff --git a/registry/vulkan/scripts/conventions.py b/codegen/vulkan/scripts/conventions.py
index edf90596..edf90596 100644
--- a/registry/vulkan/scripts/conventions.py
+++ b/codegen/vulkan/scripts/conventions.py
diff --git a/registry/vulkan/scripts/deperiodize_vuids.py b/codegen/vulkan/scripts/deperiodize_vuids.py
index c02a1581..c02a1581 100755
--- a/registry/vulkan/scripts/deperiodize_vuids.py
+++ b/codegen/vulkan/scripts/deperiodize_vuids.py
diff --git a/registry/vulkan/scripts/docgenerator.py b/codegen/vulkan/scripts/docgenerator.py
index bb86eb50..bb86eb50 100644
--- a/registry/vulkan/scripts/docgenerator.py
+++ b/codegen/vulkan/scripts/docgenerator.py
diff --git a/registry/vulkan/scripts/extensionmetadocgenerator.py b/codegen/vulkan/scripts/extensionmetadocgenerator.py
index 07d2c947..07d2c947 100644
--- a/registry/vulkan/scripts/extensionmetadocgenerator.py
+++ b/codegen/vulkan/scripts/extensionmetadocgenerator.py
diff --git a/registry/vulkan/scripts/genRef.py b/codegen/vulkan/scripts/genRef.py
index f108204d..f108204d 100755
--- a/registry/vulkan/scripts/genRef.py
+++ b/codegen/vulkan/scripts/genRef.py
diff --git a/registry/vulkan/scripts/genRelease b/codegen/vulkan/scripts/genRelease
index f3c4a2ab..f3c4a2ab 100755
--- a/registry/vulkan/scripts/genRelease
+++ b/codegen/vulkan/scripts/genRelease
diff --git a/registry/vulkan/scripts/genanchorlinks.py b/codegen/vulkan/scripts/genanchorlinks.py
index c589bb30..c589bb30 100644
--- a/registry/vulkan/scripts/genanchorlinks.py
+++ b/codegen/vulkan/scripts/genanchorlinks.py
diff --git a/registry/vulkan/scripts/generator.py b/codegen/vulkan/scripts/generator.py
index cb5f0f59..cb5f0f59 100644
--- a/registry/vulkan/scripts/generator.py
+++ b/codegen/vulkan/scripts/generator.py
diff --git a/registry/vulkan/scripts/genspec.py b/codegen/vulkan/scripts/genspec.py
index dfa55cca..dfa55cca 100644
--- a/registry/vulkan/scripts/genspec.py
+++ b/codegen/vulkan/scripts/genspec.py
diff --git a/registry/vulkan/scripts/genvk.py b/codegen/vulkan/scripts/genvk.py
index 02cd1a5c..02cd1a5c 100755
--- a/registry/vulkan/scripts/genvk.py
+++ b/codegen/vulkan/scripts/genvk.py
diff --git a/registry/vulkan/scripts/globalizeIncludes b/codegen/vulkan/scripts/globalizeIncludes
index 3fad7776..3fad7776 100755
--- a/registry/vulkan/scripts/globalizeIncludes
+++ b/codegen/vulkan/scripts/globalizeIncludes
diff --git a/registry/vulkan/scripts/hostsyncgenerator.py b/codegen/vulkan/scripts/hostsyncgenerator.py
index a94db149..a94db149 100644
--- a/registry/vulkan/scripts/hostsyncgenerator.py
+++ b/codegen/vulkan/scripts/hostsyncgenerator.py
diff --git a/registry/vulkan/scripts/htmldiff/htmldiff b/codegen/vulkan/scripts/htmldiff/htmldiff
index a3361c75..a3361c75 100755
--- a/registry/vulkan/scripts/htmldiff/htmldiff
+++ b/codegen/vulkan/scripts/htmldiff/htmldiff
diff --git a/registry/vulkan/scripts/htmldiff/htmldiff.pl b/codegen/vulkan/scripts/htmldiff/htmldiff.pl
index af2a6cd2..af2a6cd2 100755
--- a/registry/vulkan/scripts/htmldiff/htmldiff.pl
+++ b/codegen/vulkan/scripts/htmldiff/htmldiff.pl
diff --git a/registry/vulkan/scripts/indexExt.py b/codegen/vulkan/scripts/indexExt.py
index 4eeb4f3b..4eeb4f3b 100755
--- a/registry/vulkan/scripts/indexExt.py
+++ b/codegen/vulkan/scripts/indexExt.py
diff --git a/registry/vulkan/scripts/interfacedocgenerator.py b/codegen/vulkan/scripts/interfacedocgenerator.py
index 05fafbc0..05fafbc0 100644
--- a/registry/vulkan/scripts/interfacedocgenerator.py
+++ b/codegen/vulkan/scripts/interfacedocgenerator.py
diff --git a/registry/vulkan/scripts/linkcheck.py b/codegen/vulkan/scripts/linkcheck.py
index 252112b0..252112b0 100755
--- a/registry/vulkan/scripts/linkcheck.py
+++ b/codegen/vulkan/scripts/linkcheck.py
diff --git a/registry/vulkan/scripts/make_ext_dependency.py b/codegen/vulkan/scripts/make_ext_dependency.py
index 51571286..51571286 100755
--- a/registry/vulkan/scripts/make_ext_dependency.py
+++ b/codegen/vulkan/scripts/make_ext_dependency.py
diff --git a/registry/vulkan/scripts/makemanaliases.py b/codegen/vulkan/scripts/makemanaliases.py
index df44a8a9..df44a8a9 100755
--- a/registry/vulkan/scripts/makemanaliases.py
+++ b/codegen/vulkan/scripts/makemanaliases.py
diff --git a/registry/vulkan/scripts/promote.py b/codegen/vulkan/scripts/promote.py
index c6b73ba4..c6b73ba4 100755
--- a/registry/vulkan/scripts/promote.py
+++ b/codegen/vulkan/scripts/promote.py
diff --git a/registry/vulkan/scripts/pygenerator.py b/codegen/vulkan/scripts/pygenerator.py
index 798ac322..798ac322 100644
--- a/registry/vulkan/scripts/pygenerator.py
+++ b/codegen/vulkan/scripts/pygenerator.py
diff --git a/registry/vulkan/scripts/reflib.py b/codegen/vulkan/scripts/reflib.py
index bab7d30e..bab7d30e 100644
--- a/registry/vulkan/scripts/reflib.py
+++ b/codegen/vulkan/scripts/reflib.py
diff --git a/registry/vulkan/scripts/reflow.py b/codegen/vulkan/scripts/reflow.py
index 1897b05c..1897b05c 100755
--- a/registry/vulkan/scripts/reflow.py
+++ b/codegen/vulkan/scripts/reflow.py
diff --git a/registry/vulkan/scripts/reg.py b/codegen/vulkan/scripts/reg.py
index 254cfbdb..254cfbdb 100644
--- a/registry/vulkan/scripts/reg.py
+++ b/codegen/vulkan/scripts/reg.py
diff --git a/registry/vulkan/scripts/rubygenerator.py b/codegen/vulkan/scripts/rubygenerator.py
index 8042d9b8..8042d9b8 100644
--- a/registry/vulkan/scripts/rubygenerator.py
+++ b/codegen/vulkan/scripts/rubygenerator.py
diff --git a/registry/vulkan/scripts/scriptgenerator.py b/codegen/vulkan/scripts/scriptgenerator.py
index 204639de..204639de 100644
--- a/registry/vulkan/scripts/scriptgenerator.py
+++ b/codegen/vulkan/scripts/scriptgenerator.py
diff --git a/registry/vulkan/scripts/spec_tools/__init__.py b/codegen/vulkan/scripts/spec_tools/__init__.py
index 34c01f39..34c01f39 100644
--- a/registry/vulkan/scripts/spec_tools/__init__.py
+++ b/codegen/vulkan/scripts/spec_tools/__init__.py
diff --git a/registry/vulkan/scripts/spec_tools/algo.py b/codegen/vulkan/scripts/spec_tools/algo.py
index 3b4c81f4..3b4c81f4 100644
--- a/registry/vulkan/scripts/spec_tools/algo.py
+++ b/codegen/vulkan/scripts/spec_tools/algo.py
diff --git a/registry/vulkan/scripts/spec_tools/attributes.py b/codegen/vulkan/scripts/spec_tools/attributes.py
index ef771811..ef771811 100644
--- a/registry/vulkan/scripts/spec_tools/attributes.py
+++ b/codegen/vulkan/scripts/spec_tools/attributes.py
diff --git a/registry/vulkan/scripts/spec_tools/base_printer.py b/codegen/vulkan/scripts/spec_tools/base_printer.py
index f48905ac..f48905ac 100644
--- a/registry/vulkan/scripts/spec_tools/base_printer.py
+++ b/codegen/vulkan/scripts/spec_tools/base_printer.py
diff --git a/registry/vulkan/scripts/spec_tools/consistency_tools.py b/codegen/vulkan/scripts/spec_tools/consistency_tools.py
index c256a724..c256a724 100644
--- a/registry/vulkan/scripts/spec_tools/consistency_tools.py
+++ b/codegen/vulkan/scripts/spec_tools/consistency_tools.py
diff --git a/registry/vulkan/scripts/spec_tools/console_printer.py b/codegen/vulkan/scripts/spec_tools/console_printer.py
index 18acabfd..18acabfd 100644
--- a/registry/vulkan/scripts/spec_tools/console_printer.py
+++ b/codegen/vulkan/scripts/spec_tools/console_printer.py
diff --git a/registry/vulkan/scripts/spec_tools/data_structures.py b/codegen/vulkan/scripts/spec_tools/data_structures.py
index f2808cf1..f2808cf1 100644
--- a/registry/vulkan/scripts/spec_tools/data_structures.py
+++ b/codegen/vulkan/scripts/spec_tools/data_structures.py
diff --git a/registry/vulkan/scripts/spec_tools/entity_db.py b/codegen/vulkan/scripts/spec_tools/entity_db.py
index 9a8dcfb1..9a8dcfb1 100644
--- a/registry/vulkan/scripts/spec_tools/entity_db.py
+++ b/codegen/vulkan/scripts/spec_tools/entity_db.py
diff --git a/registry/vulkan/scripts/spec_tools/file_process.py b/codegen/vulkan/scripts/spec_tools/file_process.py
index f0d4c608..f0d4c608 100644
--- a/registry/vulkan/scripts/spec_tools/file_process.py
+++ b/codegen/vulkan/scripts/spec_tools/file_process.py
diff --git a/registry/vulkan/scripts/spec_tools/html_printer.py b/codegen/vulkan/scripts/spec_tools/html_printer.py
index eb1df406..eb1df406 100644
--- a/registry/vulkan/scripts/spec_tools/html_printer.py
+++ b/codegen/vulkan/scripts/spec_tools/html_printer.py
diff --git a/registry/vulkan/scripts/spec_tools/macro_checker.py b/codegen/vulkan/scripts/spec_tools/macro_checker.py
index a8a75aa8..a8a75aa8 100644
--- a/registry/vulkan/scripts/spec_tools/macro_checker.py
+++ b/codegen/vulkan/scripts/spec_tools/macro_checker.py
diff --git a/registry/vulkan/scripts/spec_tools/macro_checker_file.py b/codegen/vulkan/scripts/spec_tools/macro_checker_file.py
index 3bca17a5..3bca17a5 100644
--- a/registry/vulkan/scripts/spec_tools/macro_checker_file.py
+++ b/codegen/vulkan/scripts/spec_tools/macro_checker_file.py
diff --git a/registry/vulkan/scripts/spec_tools/main.py b/codegen/vulkan/scripts/spec_tools/main.py
index 2cd4f69c..2cd4f69c 100644
--- a/registry/vulkan/scripts/spec_tools/main.py
+++ b/codegen/vulkan/scripts/spec_tools/main.py
diff --git a/registry/vulkan/scripts/spec_tools/shared.py b/codegen/vulkan/scripts/spec_tools/shared.py
index bb6f1657..bb6f1657 100644
--- a/registry/vulkan/scripts/spec_tools/shared.py
+++ b/codegen/vulkan/scripts/spec_tools/shared.py
diff --git a/registry/vulkan/scripts/spec_tools/util.py b/codegen/vulkan/scripts/spec_tools/util.py
index b8906798..b8906798 100644
--- a/registry/vulkan/scripts/spec_tools/util.py
+++ b/codegen/vulkan/scripts/spec_tools/util.py
diff --git a/registry/vulkan/scripts/spec_tools/validity.py b/codegen/vulkan/scripts/spec_tools/validity.py
index 745ba013..745ba013 100644
--- a/registry/vulkan/scripts/spec_tools/validity.py
+++ b/codegen/vulkan/scripts/spec_tools/validity.py
diff --git a/registry/vulkan/scripts/spirvcapgenerator.py b/codegen/vulkan/scripts/spirvcapgenerator.py
index 85740f34..85740f34 100644
--- a/registry/vulkan/scripts/spirvcapgenerator.py
+++ b/codegen/vulkan/scripts/spirvcapgenerator.py
diff --git a/registry/vulkan/scripts/testSpecVersion.py b/codegen/vulkan/scripts/testSpecVersion.py
index 4ead2b63..4ead2b63 100755
--- a/registry/vulkan/scripts/testSpecVersion.py
+++ b/codegen/vulkan/scripts/testSpecVersion.py
diff --git a/registry/vulkan/scripts/test_check_spec_links.py b/codegen/vulkan/scripts/test_check_spec_links.py
index b0c82e38..b0c82e38 100644
--- a/registry/vulkan/scripts/test_check_spec_links.py
+++ b/codegen/vulkan/scripts/test_check_spec_links.py
diff --git a/registry/vulkan/scripts/test_check_spec_links_api_specific.py b/codegen/vulkan/scripts/test_check_spec_links_api_specific.py
index 76ce6a9e..76ce6a9e 100644
--- a/registry/vulkan/scripts/test_check_spec_links_api_specific.py
+++ b/codegen/vulkan/scripts/test_check_spec_links_api_specific.py
diff --git a/registry/vulkan/scripts/test_entity_db.py b/codegen/vulkan/scripts/test_entity_db.py
index ef08794c..ef08794c 100644
--- a/registry/vulkan/scripts/test_entity_db.py
+++ b/codegen/vulkan/scripts/test_entity_db.py
diff --git a/registry/vulkan/scripts/translate_math.js b/codegen/vulkan/scripts/translate_math.js
index c2fd6d26..c2fd6d26 100644
--- a/registry/vulkan/scripts/translate_math.js
+++ b/codegen/vulkan/scripts/translate_math.js
diff --git a/registry/vulkan/scripts/validitygenerator.py b/codegen/vulkan/scripts/validitygenerator.py
index a3a84561..a3a84561 100755
--- a/registry/vulkan/scripts/validitygenerator.py
+++ b/codegen/vulkan/scripts/validitygenerator.py
diff --git a/registry/vulkan/scripts/vkconventions.py b/codegen/vulkan/scripts/vkconventions.py
index a43f7121..a43f7121 100644
--- a/registry/vulkan/scripts/vkconventions.py
+++ b/codegen/vulkan/scripts/vkconventions.py
diff --git a/registry/vulkan/scripts/xml_consistency.py b/codegen/vulkan/scripts/xml_consistency.py
index 36514531..36514531 100755
--- a/registry/vulkan/scripts/xml_consistency.py
+++ b/codegen/vulkan/scripts/xml_consistency.py
diff --git a/registry/vulkan/src/ext_loader/README.md b/codegen/vulkan/src/ext_loader/README.md
index c571986c..c571986c 100644
--- a/registry/vulkan/src/ext_loader/README.md
+++ b/codegen/vulkan/src/ext_loader/README.md
diff --git a/registry/vulkan/styleguide.txt b/codegen/vulkan/styleguide.txt
index 3c1a8dd6..3c1a8dd6 100644
--- a/registry/vulkan/styleguide.txt
+++ b/codegen/vulkan/styleguide.txt
diff --git a/registry/vulkan/tests/README.adoc b/codegen/vulkan/tests/README.adoc
index 9d52d4d6..9d52d4d6 100644
--- a/registry/vulkan/tests/README.adoc
+++ b/codegen/vulkan/tests/README.adoc
diff --git a/registry/vulkan/tests/X11/Xlib.h b/codegen/vulkan/tests/X11/Xlib.h
index c3800e90..c3800e90 100644
--- a/registry/vulkan/tests/X11/Xlib.h
+++ b/codegen/vulkan/tests/X11/Xlib.h
diff --git a/registry/vulkan/tests/X11/extensions/Xrandr.h b/codegen/vulkan/tests/X11/extensions/Xrandr.h
index fc0d7c29..fc0d7c29 100644
--- a/registry/vulkan/tests/X11/extensions/Xrandr.h
+++ b/codegen/vulkan/tests/X11/extensions/Xrandr.h
diff --git a/registry/vulkan/tests/ggp_c/vulkan_types.h b/codegen/vulkan/tests/ggp_c/vulkan_types.h
index ae922a9a..ae922a9a 100644
--- a/registry/vulkan/tests/ggp_c/vulkan_types.h
+++ b/codegen/vulkan/tests/ggp_c/vulkan_types.h
diff --git a/registry/vulkan/tests/hpptest.cpp b/codegen/vulkan/tests/hpptest.cpp
index fd6acdd1..fd6acdd1 100644
--- a/registry/vulkan/tests/hpptest.cpp
+++ b/codegen/vulkan/tests/hpptest.cpp
diff --git a/registry/vulkan/tests/htest.c b/codegen/vulkan/tests/htest.c
index aba14d84..aba14d84 100644
--- a/registry/vulkan/tests/htest.c
+++ b/codegen/vulkan/tests/htest.c
diff --git a/registry/vulkan/tests/screen/screen.h b/codegen/vulkan/tests/screen/screen.h
index 4f73f080..4f73f080 100644
--- a/registry/vulkan/tests/screen/screen.h
+++ b/codegen/vulkan/tests/screen/screen.h
diff --git a/registry/vulkan/tests/wayland-client.h b/codegen/vulkan/tests/wayland-client.h
index e69de29b..e69de29b 100644
--- a/registry/vulkan/tests/wayland-client.h
+++ b/codegen/vulkan/tests/wayland-client.h
diff --git a/registry/vulkan/tests/windows.h b/codegen/vulkan/tests/windows.h
index 8e9e4846..8e9e4846 100644
--- a/registry/vulkan/tests/windows.h
+++ b/codegen/vulkan/tests/windows.h
diff --git a/registry/vulkan/tests/xcb/xcb.h b/codegen/vulkan/tests/xcb/xcb.h
index 2438f182..2438f182 100644
--- a/registry/vulkan/tests/xcb/xcb.h
+++ b/codegen/vulkan/tests/xcb/xcb.h
diff --git a/registry/vulkan/tests/zircon/types.h b/codegen/vulkan/tests/zircon/types.h
index 5ad096dc..5ad096dc 100644
--- a/registry/vulkan/tests/zircon/types.h
+++ b/codegen/vulkan/tests/zircon/types.h
diff --git a/registry/vulkan/update_valid_usage_ids.sh b/codegen/vulkan/update_valid_usage_ids.sh
index 524bcb3b..524bcb3b 100755
--- a/registry/vulkan/update_valid_usage_ids.sh
+++ b/codegen/vulkan/update_valid_usage_ids.sh
diff --git a/registry/vulkan/xml/Makefile b/codegen/vulkan/xml/Makefile
index d786bf7d..d786bf7d 100644
--- a/registry/vulkan/xml/Makefile
+++ b/codegen/vulkan/xml/Makefile
diff --git a/registry/vulkan/xml/README.adoc b/codegen/vulkan/xml/README.adoc
index 1fee04d4..1fee04d4 100644
--- a/registry/vulkan/xml/README.adoc
+++ b/codegen/vulkan/xml/README.adoc
diff --git a/registry/vulkan/xml/generate-core-block.rb b/codegen/vulkan/xml/generate-core-block.rb
index 3a97e300..3a97e300 100644
--- a/registry/vulkan/xml/generate-core-block.rb
+++ b/codegen/vulkan/xml/generate-core-block.rb
diff --git a/registry/vulkan/xml/registry.rnc b/codegen/vulkan/xml/registry.rnc
index ad645c04..ad645c04 100644
--- a/registry/vulkan/xml/registry.rnc
+++ b/codegen/vulkan/xml/registry.rnc
diff --git a/registry/vulkan/xml/vk.xml b/codegen/vulkan/xml/vk.xml
index 73245d2e..73245d2e 100644
--- a/registry/vulkan/xml/vk.xml
+++ b/codegen/vulkan/xml/vk.xml
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
new file mode 100644
index 00000000..09684e6a
--- /dev/null
+++ b/common/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(vulkan)
\ No newline at end of file
diff --git a/common/vulkan/Android.bp b/common/vulkan/Android.bp
new file mode 100644
index 00000000..6267636d
--- /dev/null
+++ b/common/vulkan/Android.bp
@@ -0,0 +1,9 @@
+cc_library_headers {
+    name: "gfxstream_vulkan_headers",
+    export_include_dirs: ["include"],
+    host_supported: true,
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+}
diff --git a/common/vulkan/CMakeLists.txt b/common/vulkan/CMakeLists.txt
new file mode 100644
index 00000000..d1a78edb
--- /dev/null
+++ b/common/vulkan/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_library(gfxstream_vulkan_headers INTERFACE)
+target_include_directories(
+    gfxstream_vulkan_headers
+    INTERFACE include)
+android_license(TARGET gfxstream_vulkan_headers LICENSE Apache-2.0)
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/common/vulkan/include/vk_video/vulkan_video_codec_h264std.h
index 3338fe14..3338fe14 100644
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std.h
+++ b/common/vulkan/include/vk_video/vulkan_video_codec_h264std.h
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h b/common/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
index cb0d1df5..cb0d1df5 100644
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
+++ b/common/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h b/common/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
index f3a0d3ad..f3a0d3ad 100644
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
+++ b/common/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std.h b/common/vulkan/include/vk_video/vulkan_video_codec_h265std.h
index 179c6b70..179c6b70 100644
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std.h
+++ b/common/vulkan/include/vk_video/vulkan_video_codec_h265std.h
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h b/common/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
index a1efa055..a1efa055 100644
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
+++ b/common/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h b/common/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
index ffffef20..ffffef20 100644
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
+++ b/common/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codecs_common.h b/common/vulkan/include/vk_video/vulkan_video_codecs_common.h
index 8cc227a6..8cc227a6 100644
--- a/registry/vulkan/include/vk_video/vulkan_video_codecs_common.h
+++ b/common/vulkan/include/vk_video/vulkan_video_codecs_common.h
diff --git a/registry/vulkan/include/vulkan/vk_platform.h b/common/vulkan/include/vulkan/vk_platform.h
index 18b913ab..18b913ab 100644
--- a/registry/vulkan/include/vulkan/vk_platform.h
+++ b/common/vulkan/include/vulkan/vk_platform.h
diff --git a/registry/vulkan/include/vulkan/vulkan.h b/common/vulkan/include/vulkan/vulkan.h
index 3f7cdba5..3f7cdba5 100644
--- a/registry/vulkan/include/vulkan/vulkan.h
+++ b/common/vulkan/include/vulkan/vulkan.h
diff --git a/include/vulkan/include/vulkan/vulkan_android.h b/common/vulkan/include/vulkan/vulkan_android.h
index a8a83067..a8a83067 100644
--- a/include/vulkan/include/vulkan/vulkan_android.h
+++ b/common/vulkan/include/vulkan/vulkan_android.h
diff --git a/include/vulkan/include/vulkan/vulkan_beta.h b/common/vulkan/include/vulkan/vulkan_beta.h
index d2f34d1c..d2f34d1c 100644
--- a/include/vulkan/include/vulkan/vulkan_beta.h
+++ b/common/vulkan/include/vulkan/vulkan_beta.h
diff --git a/include/vulkan/include/vulkan/vulkan_core.h b/common/vulkan/include/vulkan/vulkan_core.h
index 19e9ffe6..19e9ffe6 100644
--- a/include/vulkan/include/vulkan/vulkan_core.h
+++ b/common/vulkan/include/vulkan/vulkan_core.h
diff --git a/include/vulkan/include/vulkan/vulkan_directfb.h b/common/vulkan/include/vulkan/vulkan_directfb.h
index 8eaac6e4..8eaac6e4 100644
--- a/include/vulkan/include/vulkan/vulkan_directfb.h
+++ b/common/vulkan/include/vulkan/vulkan_directfb.h
diff --git a/include/vulkan/include/vulkan/vulkan_fuchsia.h b/common/vulkan/include/vulkan/vulkan_fuchsia.h
index 44b4ace3..44b4ace3 100644
--- a/include/vulkan/include/vulkan/vulkan_fuchsia.h
+++ b/common/vulkan/include/vulkan/vulkan_fuchsia.h
diff --git a/include/vulkan/include/vulkan/vulkan_ggp.h b/common/vulkan/include/vulkan/vulkan_ggp.h
index 9a6a582c..9a6a582c 100644
--- a/include/vulkan/include/vulkan/vulkan_ggp.h
+++ b/common/vulkan/include/vulkan/vulkan_ggp.h
diff --git a/include/vulkan/include/vulkan/vulkan_ios.h b/common/vulkan/include/vulkan/vulkan_ios.h
index 6e7e6afe..6e7e6afe 100644
--- a/include/vulkan/include/vulkan/vulkan_ios.h
+++ b/common/vulkan/include/vulkan/vulkan_ios.h
diff --git a/include/vulkan/include/vulkan/vulkan_macos.h b/common/vulkan/include/vulkan/vulkan_macos.h
index c49b123d..c49b123d 100644
--- a/include/vulkan/include/vulkan/vulkan_macos.h
+++ b/common/vulkan/include/vulkan/vulkan_macos.h
diff --git a/include/vulkan/include/vulkan/vulkan_metal.h b/common/vulkan/include/vulkan/vulkan_metal.h
index 5cf4a703..5cf4a703 100644
--- a/include/vulkan/include/vulkan/vulkan_metal.h
+++ b/common/vulkan/include/vulkan/vulkan_metal.h
diff --git a/include/vulkan/include/vulkan/vulkan_screen.h b/common/vulkan/include/vulkan/vulkan_screen.h
index 92ad9bfa..92ad9bfa 100644
--- a/include/vulkan/include/vulkan/vulkan_screen.h
+++ b/common/vulkan/include/vulkan/vulkan_screen.h
diff --git a/include/vulkan/include/vulkan/vulkan_vi.h b/common/vulkan/include/vulkan/vulkan_vi.h
index 9e0dcca2..9e0dcca2 100644
--- a/include/vulkan/include/vulkan/vulkan_vi.h
+++ b/common/vulkan/include/vulkan/vulkan_vi.h
diff --git a/include/vulkan/include/vulkan/vulkan_wayland.h b/common/vulkan/include/vulkan/vulkan_wayland.h
index 2a329be9..2a329be9 100644
--- a/include/vulkan/include/vulkan/vulkan_wayland.h
+++ b/common/vulkan/include/vulkan/vulkan_wayland.h
diff --git a/include/vulkan/include/vulkan/vulkan_win32.h b/common/vulkan/include/vulkan/vulkan_win32.h
index 1b680f0b..1b680f0b 100644
--- a/include/vulkan/include/vulkan/vulkan_win32.h
+++ b/common/vulkan/include/vulkan/vulkan_win32.h
diff --git a/include/vulkan/include/vulkan/vulkan_xcb.h b/common/vulkan/include/vulkan/vulkan_xcb.h
index 5ba2ad85..5ba2ad85 100644
--- a/include/vulkan/include/vulkan/vulkan_xcb.h
+++ b/common/vulkan/include/vulkan/vulkan_xcb.h
diff --git a/include/vulkan/include/vulkan/vulkan_xlib.h b/common/vulkan/include/vulkan/vulkan_xlib.h
index 75c75dc2..75c75dc2 100644
--- a/include/vulkan/include/vulkan/vulkan_xlib.h
+++ b/common/vulkan/include/vulkan/vulkan_xlib.h
diff --git a/include/vulkan/include/vulkan/vulkan_xlib_xrandr.h b/common/vulkan/include/vulkan/vulkan_xlib_xrandr.h
index fa274934..fa274934 100644
--- a/include/vulkan/include/vulkan/vulkan_xlib_xrandr.h
+++ b/common/vulkan/include/vulkan/vulkan_xlib_xrandr.h