Merge "Fix ext check in EXT_draw_buffers_indexed negative tests"

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

diff --git a/Android.mk b/Android.mk
index 0ae3320..b93f65d 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,13 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+# The clang-tidy google-explicit-constructor warning is issued to nearly
+# 1000 conversion constructors in this project. They are from more than
+# 500 source files. Most of them should be declared explicit, but many
+# of them need to be implicit. Until we correctly mark them as explicit
+# or NOLINT(implicit), we suppress the google-explicit-constructor check.
+LOCAL_TIDY_CHECKS := -google-explicit-constructor
+
 delibs_dir := $(LOCAL_PATH)/framework/delibs
 deqp_dir := $(LOCAL_PATH)/
 
@@ -766,6 +773,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp \
        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/vktPipelineMultisampleTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.cpp \
@@ -787,8 +795,8 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderIntegerFunctionTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderPackingFunctionTests.cpp \
-       external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp \
+       external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp \
@@ -845,6 +853,10 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationWindingTests.cpp \
+       external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp \
+       external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp \
+       external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringTests.cpp \
+       external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp \
        external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp \
        external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp \
        external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp \
@@ -918,6 +930,7 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ssbo \
        $(deqp_dir)/external/vulkancts/modules/vulkan/synchronization \
        $(deqp_dir)/external/vulkancts/modules/vulkan/tessellation \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/texture_filtering \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ubo \
        $(deqp_dir)/external/vulkancts/modules/vulkan/wsi