commit 6cb3e6681bd56b120454fe4f5cc897bd5b090d9f
author Mark Lobodzinski <mark@lunarg.com> Tue Dec 27 14:47:47 2016 -0700
committer Mark Lobodzinski <mark@lunarg.com> Wed Dec 28 07:43:53 2016 -0700
tree d93cb00659cac14322e475b5f909a9224e2b9a93
parent 1fa20f9fa8583d5a97ac09c0b39eb22eedb5e30a

android: Update build scripts w/enum_string codegen

The enum_string_helper header is now generated from vk.xml.

Change-Id: I6adf09663c87b21623993a939a8ad60e343a805d

build-android/android-generate.bat

diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index b99f9c6..7761e21 100644
--- a/build-android/android-generate.bat
+++ b/build-android/android-generate.bat
@@ -19,10 +19,10 @@
 )

 mkdir generated\include generated\common

 

-py -3 ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include

 py -3 ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include

 

 cd generated/include

+py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h

 py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h

 py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h

 py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h

build-android/android-generate.sh

diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
index 4c3da0d..4896c80 100755
--- a/build-android/android-generate.sh
+++ b/build-android/android-generate.sh
@@ -21,9 +21,9 @@
 rm -rf generated
 mkdir -p generated/include generated/common
 
-python3 ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include
 python3 ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include
 
+( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h )
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h )
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h )
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h )