diff options
| author | Mike Stroyan <stroyan@google.com> | 2016-02-16 17:29:52 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-02-18 15:42:04 -0700 |
| commit | e49b32edc3b5dfece4235fcb9bbc53c92a4a2957 (patch) | |
| tree | 7bd4e944deee3ff9292a9d4a6bd623c6eaa96542 | |
| parent | ed3d11ad52a0e97d58bbf751b2c12707e77abc6f (diff) | |
| download | usermoji-e49b32edc3b5dfece4235fcb9bbc53c92a4a2957.tar.xz | |
layers: param_check- enable android build
Update android build to use new param_check header files
| -rwxr-xr-x | buildAndroid/android-generate.sh | 1 | ||||
| -rw-r--r-- | buildAndroid/jni/Android.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh index 725ef1ac..496e349f 100755 --- a/buildAndroid/android-generate.sh +++ b/buildAndroid/android-generate.sh @@ -25,4 +25,5 @@ python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_ou python ../vk-layer-generate.py object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp python ../vk-layer-generate.py 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 ParamCheck -registry ../../vk.xml param_check.h ) diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index ca9294bd..9241fa2a 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -84,6 +84,7 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
LOCAL_C_INCLUDES += $(SRC_DIR)/include \
$(SRC_DIR)/buildAndroid/generated \
+ $(SRC_DIR)/layers \
$(SRC_DIR)/loader
LOCAL_STATIC_LIBRARIES += layer_utils
LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
|