summaryrefslogtreecommitdiff
path: root/build-android
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2017-01-10 11:55:48 -0700
committerMark Lobodzinski <mark@lunarg.com>2017-01-11 07:26:37 -0700
commit023d0048e1e17fce79a96afec82ef6cffd49e74d (patch)
tree967533b7452d8f2f33eb463bd9cf37d5fec86728 /build-android
parentb06851c3c06b47743076e15454cdd388ff0722bb (diff)
android: Switch safe_struct over to new codegen
Change-Id: Ia89cfec2b836437c2f2009608795d1ee38b811ad
Diffstat (limited to 'build-android')
-rw-r--r--build-android/android-generate.bat4
-rwxr-xr-xbuild-android/android-generate.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index 4d1e0504..283be55c 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 e081b1c3..09022a39 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 )