Merge "Clean up Win32 platform code" into nyc-dev

[platform/upstream/VK-GL-CTS.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 7a15c0b..99e7a2c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -713,6 +713,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateGeneralTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateImageObjectUtil.cpp \
        external/vulkancts/modules/vulkan/vktTestPackage.cpp \
+       external/vulkancts/modules/vulkan/vktSynchronization.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderPackingFunctionTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderIntegerFunctionTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp \
@@ -784,6 +785,9 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp \
        external/vulkancts/framework/vulkan/vkBuilderUtil.cpp \
        external/vulkancts/framework/vulkan/vkSpirVProgram.cpp \
        external/vulkancts/framework/vulkan/vkPrograms.cpp \
@@ -802,7 +806,9 @@ LOCAL_SRC_FILES := \
        external/vulkancts/framework/vulkan/vkTypeUtil.cpp \
        external/vulkancts/framework/vulkan/vkImageUtil.cpp \
        external/vulkancts/framework/vulkan/vkQueryUtil.cpp \
-       external/vulkancts/framework/vulkan/vkRef.cpp
+       external/vulkancts/framework/vulkan/vkRef.cpp \
+       external/vulkancts/framework/vulkan/vkWsiPlatform.cpp \
+       external/vulkancts/framework/vulkan/vkWsiUtil.cpp
 
 LOCAL_C_INCLUDES := \
        frameworks/native/opengl/include \
@@ -857,7 +863,8 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/shaderrender \
        $(deqp_dir)/external/vulkancts/modules/vulkan/spirv_assembly \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ssbo \
-       $(deqp_dir)/external/vulkancts/modules/vulkan/ubo
+       $(deqp_dir)/external/vulkancts/modules/vulkan/ubo \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/wsi
 
 deqp_compile_flags := \
        -DDEQP_SUPPORT_EGL=1 \
@@ -890,7 +897,7 @@ LOCAL_CFLAGS += \
        $(deqp_compile_flags)
 
 LOCAL_SDK_VERSION := 9
-LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
+LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -fwrapv
 LOCAL_NDK_STL_VARIANT := gnustl_static
 LOCAL_RTTI_FLAG := -frtti -fexceptions
 LOCAL_MULTILIB := both