diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2018-12-04 14:15:47 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2018-12-18 09:38:59 -0700 |
| commit | 1f2ba26251e53c7fe89b3cce947eb656af8312d5 (patch) | |
| tree | a60cce86e7b0491028ff1b017f82a163b0cebbe6 /build-android/jni/Android.mk | |
| parent | 716a4f9d21547aeab6d29274bfc15d14ff2afafa (diff) | |
| download | vulkan-validation-layers-1f2ba26251e53c7fe89b3cce947eb656af8312d5.tar.gz | |
layers: Refactor threading layer to use chassis
Added:
thread_safety_validation.h
thread_safety.cpp (codegen)
thread_safety.h (codegen)
Removed:
threading.cpp
threading.h
thread_check.h (codegen)
Also modified the chassis to allow control over pre/post calls on
a per-validation-object basis.
Change-Id: I63600d6e7ea1e14ae4796fe949d36420c7dd4dec
Diffstat (limited to 'build-android/jni/Android.mk')
| -rw-r--r-- | build-android/jni/Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index 3036a4bd7..563ce381b 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -86,13 +86,15 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_threading -LOCAL_SRC_FILES += $(SRC_DIR)/layers/threading.cpp +LOCAL_SRC_FILES += $(LAYER_DIR)/include/thread_safety.cpp +LOCAL_SRC_FILES += $(LAYER_DIR)/include/layer_chassis_dispatch.cpp +LOCAL_SRC_FILES += $(LAYER_DIR)/include/chassis.cpp LOCAL_C_INCLUDES += $(VULKAN_INCLUDE) \ $(LOCAL_PATH)/$(SRC_DIR)/layers \ $(LOCAL_PATH)/$(LAYER_DIR)/include LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden +LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden -DBUILD_THREAD_SAFETY LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL |