resolve merge conflicts of 3ffc2f2 to master

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

diff --git a/Android.mk b/Android.mk
index f8488ac..7f0700c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -754,6 +754,9 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateVPTests.cpp \
+       external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.cpp \
+       external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorTests.cpp \
+       external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp \
@@ -776,7 +779,10 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleImageTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleInterpolationTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTestsUtil.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp \
@@ -920,6 +926,7 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/compute \
        $(deqp_dir)/external/vulkancts/modules/vulkan/draw \
        $(deqp_dir)/external/vulkancts/modules/vulkan/dynamic_state \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/fragment_ops \
        $(deqp_dir)/external/vulkancts/modules/vulkan/image \
        $(deqp_dir)/external/vulkancts/modules/vulkan/memory \
        $(deqp_dir)/external/vulkancts/modules/vulkan/pipeline \
@@ -966,7 +973,7 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_CFLAGS += \
        $(deqp_compile_flags)
 
-LOCAL_SDK_VERSION := 9
+LOCAL_SDK_VERSION := 22
 LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -fwrapv
 LOCAL_NDK_STL_VARIANT := gnustl_static
 LOCAL_RTTI_FLAG := -frtti -fexceptions