diff options
| author | Mike Stroyan <stroyan@google.com> | 2016-01-29 15:11:28 -0700 |
|---|---|---|
| committer | Mike Stroyan <stroyan@google.com> | 2016-02-05 11:05:05 -0700 |
| commit | dd73dd7234e761346b4314c0e6a73f59ef069d16 (patch) | |
| tree | e10403eb16e372c849c4bf5b8fe2c56d6bf53ce1 /buildAndroid | |
| parent | 2dea17cffae32e81730d9534c352badb64d27e1e (diff) | |
| download | usermoji-dd73dd7234e761346b4314c0e6a73f59ef069d16.tar.xz | |
layers: change android build to xml threading
Use threading validation layer generated from vk.xml for android.
Diffstat (limited to 'buildAndroid')
| -rwxr-xr-x | buildAndroid/android-generate.sh | 2 | ||||
| -rw-r--r-- | buildAndroid/jni/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh index 4c07a6b2..69d53f6d 100755 --- a/buildAndroid/android-generate.sh +++ b/buildAndroid/android-generate.sh @@ -23,5 +23,5 @@ python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated python ../vk-layer-generate.py object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp -python ../vk-layer-generate.py threading ../include/vulkan/vulkan.h > generated/threading.cpp +( cd generated; python ../../genvk.py threading -registry ../../vk.xml thread_check.h ) diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index de3a5dcd..16a412b6 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -105,7 +105,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS)
LOCAL_MODULE := VkLayer_threading
-LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/threading.cpp
+LOCAL_SRC_FILES += $(SRC_DIR)/layers/threading.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
LOCAL_C_INCLUDES += $(SRC_DIR)/include \
$(SRC_DIR)/layers \
|