From dd73dd7234e761346b4314c0e6a73f59ef069d16 Mon Sep 17 00:00:00 2001 From: Mike Stroyan Date: Fri, 29 Jan 2016 15:11:28 -0700 Subject: [PATCH] layers: change android build to xml threading Use threading validation layer generated from vk.xml for android. --- buildAndroid/android-generate.sh | 2 +- buildAndroid/jni/Android.mk | 2 +- layers/threading.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh index 4c07a6b..69d53f6 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 de3a5dc..16a412b 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 \ diff --git a/layers/threading.cpp b/layers/threading.cpp index 195f9e5..238cca7 100644 --- a/layers/threading.cpp +++ b/layers/threading.cpp @@ -29,7 +29,7 @@ #include using namespace std; -#include "vk_layer.h" +#include "vulkan/vk_layer.h" #include "vk_layer_config.h" #include "vk_layer_extension_utils.h" #include "vk_layer_utils.h" -- 2.7.4