From 694e0a5361f7e2290e17e1b09c4cca99ca744dfa Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 10 Jan 2017 11:55:48 -0700 Subject: [PATCH] android: Switch safe_struct over to new codegen Change-Id: Ia89cfec2b836437c2f2009608795d1ee38b811ad --- build-android/android-generate.bat | 4 ++-- build-android/android-generate.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index 4d1e050..283be55 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -19,9 +19,9 @@ if exist generated ( ) mkdir generated\include generated\common -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_safe_struct.h +py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_safe_struct.cpp py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_struct_size_helper.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_struct_size_helper.c py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh index e081b1c..09022a3 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -21,8 +21,8 @@ cd $dir rm -rf generated mkdir -p generated/include generated/common -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_safe_struct.h ) +( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_safe_struct.cpp ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_struct_size_helper.h ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_struct_size_helper.c ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h ) -- 2.7.4