android: Add Android and C++ support to a couple files

These are needed downstream in VulkanTools for Android support.

2 files changed, 17 insertions, 0 deletions

diff --git a/include/vulkan/vk_icd.h b/include/vulkan/vk_icd.h
index c26d1f74..7b54fb57 100644
--- a/include/vulkan/vk_icd.h
+++ b/include/vulkan/vk_icd.h
@@ -111,6 +111,12 @@ typedef struct {
 } VkIcdSurfaceXlib;
 #endif // VK_USE_PLATFORM_XLIB_KHR
 
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+typedef struct {
+    ANativeWindow* window;
+} VkIcdSurfaceAndroid;
+#endif //VK_USE_PLATFORM_ANDROID_KHR
+
 typedef struct {
     VkIcdSurfaceBase base;
     VkDisplayModeKHR displayMode;
diff --git a/vk_helper.py b/vk_helper.py
index 5a36fbba..bb0ee82c 100755
--- a/vk_helper.py
+++ b/vk_helper.py
@@ -579,6 +579,7 @@ class StructWrapperGen:
         self.size_helper_gen.setCopyright(self._generateCopyright())
         self.size_helper_gen.setHeader(self._generateSizeHelperHeader())
         self.size_helper_gen.setBody(self._generateSizeHelperFunctions())
+        self.size_helper_gen.setFooter(self._generateSizeHelperFooter())
         self.size_helper_gen.generate()
 
     def generateSizeHelperC(self):
@@ -1482,6 +1483,10 @@ class StructWrapperGen:
 
     def _generateSizeHelperHeader(self):
         header = []
+        header.append('\n#ifdef __cplusplus\n')
+        header.append('extern "C" {\n')
+        header.append('#endif\n')
+        header.append("\n")
         header.append("//#includes, #defines, globals and such...\n")
         for f in self.include_headers:
             header.append("#include <%s>\n" % f)
@@ -1498,6 +1503,12 @@ class StructWrapperGen:
         header.append('\n// Function definitions\n')
         return "\n".join(header)
 
+    def _generateSizeHelperFooter(self):
+        footer = []
+        footer.append('\n\n#ifdef __cplusplus')
+        footer.append('}')
+        footer.append('#endif')
+        return "\n".join(footer)
 
     def _generateHeader(self):
         header = []