diff options
| author | Cody Northrop <cnorthrop@google.com> | 2016-02-24 14:44:39 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-02-26 10:24:50 -0700 |
| commit | 59307e214cddb2b5aa779d8f726a960dcc7033a4 (patch) | |
| tree | 1af8af9a8d5d40a26f3e050925509313ee95c64f | |
| parent | 114fa0abbd0028e511dd128943f86a0ce2747b51 (diff) | |
| download | usermoji-59307e214cddb2b5aa779d8f726a960dcc7033a4.tar.xz | |
android: Drop layer validation tests for now
| -rw-r--r-- | buildAndroid/jni/Android.mk | 15 | ||||
| -rw-r--r-- | buildAndroid/jni/Application.mk | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index 9241fa2a..1d2f0f78 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -143,19 +143,4 @@ LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR 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_STATIC_LIBRARIES := googletest_main layer_utils
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-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 781edd6f..5be2d485 100644 --- a/buildAndroid/jni/Application.mk +++ b/buildAndroid/jni/Application.mk @@ -16,6 +16,6 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
APP_PLATFORM := android-22
APP_STL := gnustl_static
-APP_MODULES := layer_utils VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects VkLayerValidationTests
+APP_MODULES := layer_utils VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects
APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
NDK_TOOLCHAIN_VERSION := clang
|