x11: Fix deadlock am: 5e863331b2

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

diff --git a/Android.mk b/Android.mk
index 0c2bca7..52c027d 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -589,6 +589,7 @@ LOCAL_SRC_FILES := \
        modules/gles31/functional/es31fNegativeShaderDirectiveTests.cpp \
        modules/gles31/functional/es31fNegativeShaderFunctionTests.cpp \
        modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.cpp \
+       modules/gles31/functional/es31fNegativeShaderStorageTests.cpp \
        modules/gles31/functional/es31fNegativeStateApiTests.cpp \
        modules/gles31/functional/es31fNegativeTestShared.cpp \
        modules/gles31/functional/es31fNegativeTextureApiTests.cpp \
@@ -726,6 +727,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp \
        external/vulkancts/modules/vulkan/api/vktApiFillBufferTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiNullHandleTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp \
@@ -762,6 +764,15 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorMultiViewportTests.cpp \
        external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorTests.cpp \
        external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryBasicClass.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryBasicGeometryShaderTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryEmitGeometryShaderTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryInputGeometryShaderTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryInstancedRenderingTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryLayeredRenderingTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryVaryingGeometryShaderTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageLoadStoreUtil.cpp \
@@ -774,6 +785,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.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/pipeline/vktPipelineBlendTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp \
@@ -791,6 +803,7 @@ LOCAL_SRC_FILES := \
        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/vktPipelineRenderToImageTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantUtil.cpp \
@@ -826,12 +839,14 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp \
        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/vktSparseResourcesImageMemoryAliasing.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp \
-       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp \
+       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.cpp \
+       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp \
@@ -869,6 +884,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationWindingTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktSampleVerifier.cpp \
        external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureFilteringAnisotropyTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp \
        external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp \
@@ -937,6 +953,7 @@ LOCAL_C_INCLUDES := \
        $(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/geometry \
        $(deqp_dir)/external/vulkancts/modules/vulkan/image \
        $(deqp_dir)/external/vulkancts/modules/vulkan/memory \
        $(deqp_dir)/external/vulkancts/modules/vulkan/pipeline \