Exclude dEQP-VK.ssbo.layout.random.scalar.75 from Android CTS

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

diff --git a/AndroidGen.mk b/AndroidGen.mk
index fab4c27..e357476 100644 (file)
--- a/AndroidGen.mk
+++ b/AndroidGen.mk
@@ -28,9 +28,11 @@ LOCAL_SRC_FILES := \
        executor/xeXMLWriter.cpp \
        external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp \
        external/vulkancts/framework/vulkan/vkApiVersion.cpp \
+       external/vulkancts/framework/vulkan/vkBarrierUtil.cpp \
        external/vulkancts/framework/vulkan/vkBinaryRegistry.cpp \
        external/vulkancts/framework/vulkan/vkBufferWithMemory.cpp \
        external/vulkancts/framework/vulkan/vkBuilderUtil.cpp \
+       external/vulkancts/framework/vulkan/vkCmdUtil.cpp \
        external/vulkancts/framework/vulkan/vkDebugReportUtil.cpp \
        external/vulkancts/framework/vulkan/vkDefs.cpp \
        external/vulkancts/framework/vulkan/vkDeviceUtil.cpp \
@@ -38,11 +40,13 @@ LOCAL_SRC_FILES := \
        external/vulkancts/framework/vulkan/vkImageWithMemory.cpp \
        external/vulkancts/framework/vulkan/vkMemUtil.cpp \
        external/vulkancts/framework/vulkan/vkNullDriver.cpp \
+       external/vulkancts/framework/vulkan/vkObjUtil.cpp \
        external/vulkancts/framework/vulkan/vkPlatform.cpp \
        external/vulkancts/framework/vulkan/vkPrograms.cpp \
        external/vulkancts/framework/vulkan/vkQueryUtil.cpp \
        external/vulkancts/framework/vulkan/vkRef.cpp \
        external/vulkancts/framework/vulkan/vkRefUtil.cpp \
+       external/vulkancts/framework/vulkan/vkRenderDocUtil.cpp \
        external/vulkancts/framework/vulkan/vkShaderProgram.cpp \
        external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp \
        external/vulkancts/framework/vulkan/vkSpirVAsm.cpp \
@@ -61,7 +65,9 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/api/vktApiComputeInstanceResultBuffer.cpp \
        external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiDescriptorSetTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp \
        external/vulkancts/modules/vulkan/api/vktApiFillBufferTests.cpp \
@@ -69,11 +75,15 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiMaintenance3Check.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiNullHandleTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiPipelineTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp \
+       external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp \
+       external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp \
        external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp \
@@ -82,17 +92,27 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeTests.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp \
+       external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalClearAttachmentTests.cpp \
+       external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDispatchTests.cpp \
+       external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawAndClearTests.cpp \
+       external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawTests.cpp \
+       external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalRenderingTestUtil.cpp \
+       external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalTests.cpp \
        external/vulkancts/modules/vulkan/device_group/vktDeviceGroupRendering.cpp \
        external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawBufferObjectUtil.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawDifferingInterpolationTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawInvertedDepthRangesTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawShaderDrawParametersTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawShaderLayerTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawShaderViewportIndexTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawSimpleTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp \
@@ -130,17 +150,24 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/image/vktImageTranscodingSupportTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryBindingTests.cpp \
+       external/vulkancts/modules/vulkan/memory/vktMemoryExternalMemoryHostTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryRequirementsTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryTests.cpp \
+       external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp \
+       external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderPassUtil.cpp \
        external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp \
        external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.cpp \
        external/vulkancts/modules/vulkan/multiview/vktMultiViewTests.cpp \
+       external/vulkancts/modules/vulkan/pch.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineClearUtil.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineDerivativeTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineDynamicOffsetTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineEarlyDestroyTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageTests.cpp \
@@ -148,20 +175,24 @@ 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/vktPipelineMatchedAttachmentsTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBase.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolve.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleBaseResolveAndPerSampleFetch.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleImageTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleInterpolationTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleSampleLocationsExtTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderBuiltInTests.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/vktPipelinePushDescriptorTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantUtil.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilExportTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp \
@@ -182,16 +213,23 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemStorageBufferTests.cpp \
        external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemTests.cpp \
        external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemUtils.cpp \
+       external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWorkgroupStorageTests.cpp \
        external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp \
        external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp \
        external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassSparseRenderTargetTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassSubpassDependencyTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassTestsUtil.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedAttachmentTests.cpp \
+       external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustnessBufferAccessTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustnessTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustnessUtil.cpp \
@@ -209,6 +247,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp \
+       external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLimitTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderMatrixTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderOperatorTests.cpp \
@@ -222,6 +261,8 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferTests.cpp \
+       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageAlignedMipSize.cpp \
+       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageBlockShapes.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp \
@@ -234,19 +275,29 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm8bitStorageTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCompositeInsertTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmConditionalBranchTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmImageSamplerTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmIndexingTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmLoopDepInfTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmLoopDepLenTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPointerParameterTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSpirvVersionTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTypeTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmUboMatrixPaddingTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmUtils.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariableInitTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVaryingNameTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmWorkgroupMemoryTests.cpp \
        external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp \
        external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp \
@@ -257,6 +308,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp \
+       external/vulkancts/modules/vulkan/subgroups/vktSubgroupsPartitionedTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp \
@@ -298,13 +350,16 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureShadowTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureSwizzleTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureTests.cpp \
        external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp \
        external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp \
        external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp \
-       external/vulkancts/modules/vulkan/vktDrawUtil.cpp \
-       external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp \
+       external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp \
+       external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp \
+       external/vulkancts/modules/vulkan/vkrunner/vktVkRunnerExampleTests.cpp \
+       external/vulkancts/modules/vulkan/vkrunner/vktVkRunnerTestCase.cpp \
        external/vulkancts/modules/vulkan/vktInfoTests.cpp \
        external/vulkancts/modules/vulkan/vktShaderLibrary.cpp \
        external/vulkancts/modules/vulkan/vktTestCase.cpp \
@@ -312,6 +367,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/vktTestGroupUtil.cpp \
        external/vulkancts/modules/vulkan/vktTestPackage.cpp \
        external/vulkancts/modules/vulkan/vktTestPackageEntry.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiColorSpaceTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp \
@@ -408,6 +464,7 @@ LOCAL_SRC_FILES := \
        framework/delibs/decpp/deThreadLocal.cpp \
        framework/delibs/decpp/deThreadSafeRingBuffer.cpp \
        framework/delibs/decpp/deUniquePtr.cpp \
+       framework/delibs/decpp/pch.cpp \
        framework/delibs/deimage/deImage.c \
        framework/delibs/deimage/deTarga.c \
        framework/delibs/depool/deMemPool.c \
@@ -1003,7 +1060,8 @@ LOCAL_SRC_FILES := \
        modules/internal/ditTestPackage.cpp \
        modules/internal/ditTestPackageEntry.cpp \
        modules/internal/ditTextureFormatTests.cpp \
-       modules/internal/ditVulkanTests.cpp
+       modules/internal/ditVulkanTests.cpp \
+       modules/pch.cpp
 
 LOCAL_C_INCLUDES := \
        $(deqp_dir)/execserver \
@@ -1013,6 +1071,7 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/binding_model \
        $(deqp_dir)/external/vulkancts/modules/vulkan/clipping \
        $(deqp_dir)/external/vulkancts/modules/vulkan/compute \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/conditional_rendering \
        $(deqp_dir)/external/vulkancts/modules/vulkan/device_group \
        $(deqp_dir)/external/vulkancts/modules/vulkan/draw \
        $(deqp_dir)/external/vulkancts/modules/vulkan/dynamic_state \
@@ -1020,7 +1079,9 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/geometry \
        $(deqp_dir)/external/vulkancts/modules/vulkan/image \
        $(deqp_dir)/external/vulkancts/modules/vulkan/memory \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/memory_model \
        $(deqp_dir)/external/vulkancts/modules/vulkan/multiview \
+       $(deqp_dir)/external/vulkancts/modules/vulkan \
        $(deqp_dir)/external/vulkancts/modules/vulkan/pipeline \
        $(deqp_dir)/external/vulkancts/modules/vulkan/protected_memory \
        $(deqp_dir)/external/vulkancts/modules/vulkan/query_pool \
@@ -1037,7 +1098,8 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/tessellation \
        $(deqp_dir)/external/vulkancts/modules/vulkan/texture \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ubo \
-       $(deqp_dir)/external/vulkancts/modules/vulkan \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/util \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/vkrunner \
        $(deqp_dir)/external/vulkancts/modules/vulkan/wsi \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ycbcr \
        $(deqp_dir)/framework/common \
@@ -1074,4 +1136,5 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/modules/gles31/stress \
        $(deqp_dir)/modules/gles31 \
        $(deqp_dir)/modules/glshared \
-       $(deqp_dir)/modules/internal
+       $(deqp_dir)/modules/internal \
+       $(deqp_dir)/modules