tests: Make some of the validation tests work on android

Conflicts:
	tests/vkrenderframework.h

diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk
index 3a9e87e..4c32dce 100644 (file)
--- 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\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/buildAndroid/generated\r
+                    $(SRC_DIR)/buildAndroid/generated\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -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\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -52,8 +52,8 @@ LOCAL_MODULE := VKLayerMemTracker
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/mem_tracker.cpp\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -63,8 +63,8 @@ LOCAL_MODULE := VKLayerShaderCheker
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/shader_checker.cpp\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -74,8 +74,8 @@ LOCAL_MODULE := VKLayerImage
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/image.cpp\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -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\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -97,9 +97,9 @@ LOCAL_MODULE := VKLayerGeneric
 LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/generic_layer.cpp\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/layers \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/layers \\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -109,9 +109,9 @@ LOCAL_MODULE := VKLayerAPIDump
 LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/api_dump.cpp\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/layers \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/layers \\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -121,9 +121,9 @@ LOCAL_MODULE := VKLayerObjectTracker
 LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/object_track.cpp\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/layers \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/layers \\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
@@ -133,9 +133,26 @@ LOCAL_MODULE := VKLayerThreading
 LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/threading.cpp\r
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
-                   $(SRC_DIR)/layers \\r
-                   $(SRC_DIR)/buildAndroid/generated \\r
-                   $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/layers \\r
+                    $(SRC_DIR)/buildAndroid/generated \\r
+                    $(SRC_DIR)/loader\r
 LOCAL_SHARED_LIBRARIES += layer_utils\r
 LOCAL_LDLIBS    := -llog\r
 include $(BUILD_SHARED_LIBRARY)\r
+\r
+include $(CLEAR_VARS)\r
+LOCAL_MODULE := VKLayerValidationTests\r
+LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \\r
+                   $(SRC_DIR)/tests/vktestbinding.cpp \\r
+                   $(SRC_DIR)/tests/vktestframeworkandroid.cpp \\r
+                   $(SRC_DIR)/tests/vkrenderframework.cpp\r
+LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
+                    $(SRC_DIR)/layers \\r
+                    $(SRC_DIR)/libs \\r
+                    $(SRC_DIR)/icd/common\r
+LOCAL_SHARED_LIBRARIES += layer_utils\r
+LOCAL_STATIC_LIBRARIES := googletest_main\r
+LOCAL_LDLIBS    := -lvulkan\r
+include $(BUILD_EXECUTABLE)\r
+\r
+$(call import-module,third_party/googletest)\r

diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk
index 492aa40..a711c5b 100644 (file)
--- a/buildAndroid/jni/Application.mk
+++ b/buildAndroid/jni/Application.mk
@@ -15,6 +15,6 @@
 APP_ABI := all\r
 APP_PLATFORM := android-22\r
 APP_STL := gnustl_static\r
-APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerShaderCheker VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading\r
+APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerShaderCheker VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading VKLayerValidationTests\r
 APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES\r
 NDK_TOOLCHAIN_VERSION := 4.8\r