commit bffb7fd75c42cedd2fa080692b85057b8fb04748
author Mark Lobodzinski <mark@lunarg.com> Sat Mar 24 13:24:18 2018 -0600
committer Mark Lobodzinski <mark@lunarg.com> Mon Mar 26 15:29:06 2018 -0600
tree ab778451b974046082b979e795c89c3173f1e764
parent 6c5f04ca0fb5582c287fe4633fa8686c65a13887

scripts: Fix safe_struct Android versioning issue

The VK_ANDROID_external_memory_android_hardware_buffer extension uses
an android structure that is undefined before android 'O'. Worked around
this issue by defining a dummy structure for earlier android OS versions.

Change-Id: If515920d3b1707cbeb6a0377827c680d93d516ff

scripts/helper_file_generator.py

diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py
index ca9ffc5..ea4800d 100644
--- a/scripts/helper_file_generator.py
+++ b/scripts/helper_file_generator.py
@@ -723,6 +723,12 @@
         safe_struct_helper_source = '\n'
         safe_struct_helper_source += '#include "vk_safe_struct.h"\n'
         safe_struct_helper_source += '#include <string.h>\n'
+        safe_struct_helper_source += '#ifdef VK_USE_PLATFORM_ANDROID_KHR\n'
+        safe_struct_helper_source += '#if __ANDROID_API__ < __ANDROID_API_O__\n'
+        safe_struct_helper_source += 'struct AHardwareBuffer {};\n'
+        safe_struct_helper_source += '#endif\n'
+        safe_struct_helper_source += '#endif\n'
+
         safe_struct_helper_source += '\n'
         safe_struct_helper_source += self.GenerateSafeStructSource()
         return safe_struct_helper_source