Update Vulkan headers to 1.4.318

generator/generate_vulkan_common.py

@@ -141,11 +141,18 @@ def load_api_core_versions(self, root: ET.Element):
             api_version = feature.get('number')
 
             # Get the commands added in this API version
-            commands = feature.findall('.//command')
-            for command in commands:
-                fname = command.get('name')
-                assert fname not in self, fname
-                self[fname] = [(api_version, None)]
+            parents = feature.findall(".//command/..")
+            for parent in parents:
+                # Skip functions in deprecated blocks
+                if parent.tag == 'deprecate':
+                    continue
+
+                # Include all of the other blocks
+                commands = parent.findall("command")
+                for command in commands:
+                    fname = command.get('name')
+                    assert fname not in self, fname
+                    self[fname] = [(api_version, None)]
 
     def load_api_extensions(self, root: ET.Element):
         '''

generator/vk_layer/android_build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: MIT
 # ----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -65,6 +65,7 @@ cmake \
     -DANDROID_STL=c++_static \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake" \
+    -DCMAKE_WARN_DEPRECATED=OFF \
     ..
 
 make -j1

layer_example/android_build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: MIT
 # ----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -65,6 +65,7 @@ cmake \
     -DANDROID_STL=c++_static \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake" \
+    -DCMAKE_WARN_DEPRECATED=OFF \
     ..
 
 make -j1

layer_gpu_support/android_build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: MIT
 # ----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -65,6 +65,7 @@ cmake \
     -DANDROID_STL=c++_static \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake" \
+    -DCMAKE_WARN_DEPRECATED=OFF \
     ..
 
 make -j1

layer_gpu_timeline/android_build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: MIT
 # ----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -65,6 +65,7 @@ cmake \
     -DANDROID_STL=c++_static \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake" \
+    -DCMAKE_WARN_DEPRECATED=OFF \
     ..
 
 make -j1