diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-03-17 15:08:18 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-03-21 11:31:42 -0600 |
| commit | aaab5c00073a61ef75adf497d2c70d0824cd2e67 (patch) | |
| tree | 61acd42d2854abdac2fb0c0a2496875ae2783d82 /buildAndroid | |
| parent | 1e22882a98a0f329d6f212355bfe456d690902b3 (diff) | |
| download | usermoji-aaab5c00073a61ef75adf497d2c70d0824cd2e67.tar.xz | |
layers: Rename param_checker to parameter_validation
Also, param_check.h -> parameter_validation.h and .json files changed.
Change-Id: I9db10563bcc2640fe6b90588d3c80c4fe50a8a83
Diffstat (limited to 'buildAndroid')
| -rw-r--r-- | buildAndroid/android-generate.bat | 4 | ||||
| -rwxr-xr-x | buildAndroid/android-generate.sh | 2 | ||||
| -rw-r--r-- | buildAndroid/jni/Android.mk | 4 | ||||
| -rw-r--r-- | buildAndroid/jni/Application.mk | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/buildAndroid/android-generate.bat b/buildAndroid/android-generate.bat index e8a33b01..bf053528 100644 --- a/buildAndroid/android-generate.bat +++ b/buildAndroid/android-generate.bat @@ -29,5 +29,5 @@ python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h cd generated python ../../genvk.py threading -registry ../../vk.xml thread_check.h -python ../../genvk.py paramchecker -registry ../../vk.xml param_check.h -cd ..
\ No newline at end of file +python ../../genvk.py paramchecker -registry ../../vk.xml parameter_validation.h +cd .. diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh index 694149f6..e5d3886f 100755 --- a/buildAndroid/android-generate.sh +++ b/buildAndroid/android-generate.sh @@ -25,5 +25,5 @@ python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_ou python ../vk-layer-generate.py Android object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h > generated/unique_objects.cpp ( cd generated; python ../../genvk.py threading -registry ../../vk.xml thread_check.h ) -( cd generated; python ../../genvk.py paramchecker -registry ../../vk.xml param_check.h ) +( cd generated; python ../../genvk.py paramchecker -registry ../../vk.xml parameter_validation.h ) diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index 9c681285..deb00f1b 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -65,8 +65,8 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_param_checker -LOCAL_SRC_FILES += $(SRC_DIR)/layers/param_checker.cpp +LOCAL_MODULE := VkLayer_parameter_validation +LOCAL_SRC_FILES += $(SRC_DIR)/layers/parameter_validation.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/buildAndroid/generated \ diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk index 320db267..13ec240d 100644 --- a/buildAndroid/jni/Application.mk +++ b/buildAndroid/jni/Application.mk @@ -16,6 +16,6 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
APP_PLATFORM := android-22
APP_STL := gnustl_static
-APP_MODULES := layer_utils VkLayer_core_validation VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects
+APP_MODULES := layer_utils VkLayer_core_validation VkLayer_device_limits VkLayer_image VkLayer_parameter_validation VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects
APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
NDK_TOOLCHAIN_VERSION := clang
|