From e3ee9b72ef84d16be93f764e0e9dcfa15c57dbe1 Mon Sep 17 00:00:00 2001 From: Michael Lentine Date: Tue, 3 Nov 2015 16:20:30 -0800 Subject: tests: Make some of the validation tests work on android Conflicts: tests/vkrenderframework.h --- buildAndroid/jni/Android.mk | 63 ++++++++++++++++++++++++++--------------- buildAndroid/jni/Application.mk | 2 +- 2 files changed, 41 insertions(+), 24 deletions(-) (limited to 'buildAndroid') diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index 3a9e87e5..4c32dce1 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -30,7 +30,7 @@ LOCAL_MODULE := VKLayerBasic LOCAL_SRC_FILES += $(SRC_DIR)/layers/basic.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated + $(SRC_DIR)/buildAndroid/generated LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -41,8 +41,8 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/draw_state.cpp 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)/loader + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -52,8 +52,8 @@ LOCAL_MODULE := VKLayerMemTracker LOCAL_SRC_FILES += $(SRC_DIR)/layers/mem_tracker.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -63,8 +63,8 @@ LOCAL_MODULE := VKLayerShaderCheker LOCAL_SRC_FILES += $(SRC_DIR)/layers/shader_checker.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -74,8 +74,8 @@ LOCAL_MODULE := VKLayerImage LOCAL_SRC_FILES += $(SRC_DIR)/layers/image.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -86,8 +86,8 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/param_checker.cpp 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)/loader + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -97,9 +97,9 @@ LOCAL_MODULE := VKLayerGeneric LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/generic_layer.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader + $(SRC_DIR)/layers \ + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -109,9 +109,9 @@ LOCAL_MODULE := VKLayerAPIDump LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/api_dump.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader + $(SRC_DIR)/layers \ + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -121,9 +121,9 @@ LOCAL_MODULE := VKLayerObjectTracker LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/object_track.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader + $(SRC_DIR)/layers \ + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) @@ -133,9 +133,26 @@ LOCAL_MODULE := VKLayerThreading LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/threading.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader + $(SRC_DIR)/layers \ + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader LOCAL_SHARED_LIBRARIES += layer_utils LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := VKLayerValidationTests +LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \ + $(SRC_DIR)/tests/vktestbinding.cpp \ + $(SRC_DIR)/tests/vktestframeworkandroid.cpp \ + $(SRC_DIR)/tests/vkrenderframework.cpp +LOCAL_C_INCLUDES += $(SRC_DIR)/include \ + $(SRC_DIR)/layers \ + $(SRC_DIR)/libs \ + $(SRC_DIR)/icd/common +LOCAL_SHARED_LIBRARIES += layer_utils +LOCAL_STATIC_LIBRARIES := googletest_main +LOCAL_LDLIBS := -lvulkan +include $(BUILD_EXECUTABLE) + +$(call import-module,third_party/googletest) diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk index 492aa406..a711c5bf 100644 --- a/buildAndroid/jni/Application.mk +++ b/buildAndroid/jni/Application.mk @@ -15,6 +15,6 @@ APP_ABI := all APP_PLATFORM := android-22 APP_STL := gnustl_static -APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerShaderCheker VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading +APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerShaderCheker VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading VKLayerValidationTests APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES NDK_TOOLCHAIN_VERSION := 4.8 -- cgit v1.2.3