Fix missing dependency on sparse binds
[platform/upstream/VK-GL-CTS.git] / AndroidGen.mk
index eca587a..f912cef 100644 (file)
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
        executor/xeXMLWriter.cpp \
        external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp \
        external/vulkancts/framework/vulkan/vkApiVersion.cpp \
+       external/vulkancts/framework/vulkan/vkAppParamsUtil.cpp \
        external/vulkancts/framework/vulkan/vkBarrierUtil.cpp \
        external/vulkancts/framework/vulkan/vkBinaryRegistry.cpp \
        external/vulkancts/framework/vulkan/vkBufferWithMemory.cpp \
@@ -50,6 +51,8 @@ LOCAL_SRC_FILES := \
        external/vulkancts/framework/vulkan/vkRef.cpp \
        external/vulkancts/framework/vulkan/vkRefUtil.cpp \
        external/vulkancts/framework/vulkan/vkRenderDocUtil.cpp \
+       external/vulkancts/framework/vulkan/vkResourceInterface.cpp \
+       external/vulkancts/framework/vulkan/vkSafetyCriticalUtil.cpp \
        external/vulkancts/framework/vulkan/vkShaderProgram.cpp \
        external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp \
        external/vulkancts/framework/vulkan/vkSpirVAsm.cpp \
@@ -59,6 +62,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/framework/vulkan/vkWsiPlatform.cpp \
        external/vulkancts/framework/vulkan/vkWsiUtil.cpp \
        external/vulkancts/framework/vulkan/vkYCbCrImageWithMemory.cpp \
+       external/vulkancts/modules/vulkan/amber/vktAmberDepthTests.cpp \
        external/vulkancts/modules/vulkan/amber/vktAmberGlslTests.cpp \
        external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp \
        external/vulkancts/modules/vulkan/amber/vktAmberHelper.cpp \
@@ -86,6 +90,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp \
        external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiMaintenance3Check.cpp \
        external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiNullHandleTests.cpp \
@@ -96,14 +101,15 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/api/vktApiToolingInfoTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingBufferDeviceAddressTests.cpp \
+       external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorBufferTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorCopyTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateASTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingDynamicOffsetTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp \
+       external/vulkancts/modules/vulkan/binding_model/vktBindingMutableTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp \
-       external/vulkancts/modules/vulkan/binding_model/vktBindingValveMutableTests.cpp \
        external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeCooperativeMatrixTests.cpp \
@@ -117,6 +123,7 @@ LOCAL_SRC_FILES := \
        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/vktConditionalIgnoreTests.cpp \
        external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalRenderingTestUtil.cpp \
        external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalTests.cpp \
        external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorIndexingTests.cpp \
@@ -142,18 +149,22 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/draw/vktDrawMultiExtTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawMultipleClearsWithinRenderPass.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawMultipleInterpolationTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawMultisampleLinearInterpolationTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawOutputLocationTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawScissorTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawShaderDrawParametersTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawShaderInvocationTests.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 \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateCBTests.cpp \
+       external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateClearTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateComputeTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp \
+       external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDiscardTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateGeneralTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateInheritanceTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp \
@@ -167,6 +178,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsTransientAttachmentTests.cpp \
        external/vulkancts/modules/vulkan/fragment_shader_interlock/vktFragmentShaderInterlockBasic.cpp \
        external/vulkancts/modules/vulkan/fragment_shader_interlock/vktFragmentShaderInterlockTests.cpp \
+       external/vulkancts/modules/vulkan/fragment_shading_barycentric/vktFragmentShadingBarycentricTests.cpp \
        external/vulkancts/modules/vulkan/fragment_shading_rate/vktAttachmentRateTests.cpp \
        external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp \
        external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRatePixelConsistency.cpp \
@@ -202,7 +214,9 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp \
        external/vulkancts/modules/vulkan/image/vktImageTexture.cpp \
        external/vulkancts/modules/vulkan/image/vktImageTranscodingSupportTests.cpp \
+       external/vulkancts/modules/vulkan/image/vktImageTransfer.cpp \
        external/vulkancts/modules/vulkan/imageless_framebuffer/vktImagelessFramebufferTests.cpp \
+       external/vulkancts/modules/vulkan/memory/vktMemoryAddressBindingTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryBindingTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp \
@@ -216,18 +230,30 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/memory_model/vktMemoryModelSharedLayout.cpp \
        external/vulkancts/modules/vulkan/memory_model/vktMemoryModelSharedLayoutCase.cpp \
        external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderApiTests.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderApiTestsEXT.cpp \
        external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderBuiltinTests.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderBuiltinTestsEXT.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderConditionalRenderingTestsEXT.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderInOutTestsEXT.cpp \
        external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderMiscTests.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderMiscTestsEXT.cpp \
        external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderPropertyTests.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderPropertyTestsEXT.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderProvokingVertexTestsEXT.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderQueryTestsEXT.cpp \
        external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderSmokeTests.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderSmokeTestsEXT.cpp \
        external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderSyncTests.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderSyncTestsEXT.cpp \
        external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderTests.cpp \
+       external/vulkancts/modules/vulkan/mesh_shader/vktMeshShaderUtil.cpp \
        external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.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/vktPipelineAttachmentFeedbackLoopLayoutTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineBindPointTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendOperationAdvancedTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp \
@@ -239,11 +265,14 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthRangeUnrestrictedTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineDerivativeTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineDescriptorLimitsTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineDynamicControlPoints.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineDynamicOffsetTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineEarlyDestroyTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineExecutablePropertiesTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineFramebufferAttachmentTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineImage2DViewOf3DTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp \
@@ -268,6 +297,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderFragmentMaskTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTestsUtil.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampledRenderToSingleSampledTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineNoPositionTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelinePushDescriptorTests.cpp \
@@ -276,6 +306,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSampleLocationsUtil.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerBorderSwizzleTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineShaderModuleIdentifierTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantUtil.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilExportTests.cpp \
@@ -284,6 +315,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.cpp \
+       external/vulkancts/modules/vulkan/postmortem/vktPostmortemDeviceFaultTests.cpp \
        external/vulkancts/modules/vulkan/postmortem/vktPostmortemShaderTimeoutTests.cpp \
        external/vulkancts/modules/vulkan/postmortem/vktPostmortemTests.cpp \
        external/vulkancts/modules/vulkan/postmortem/vktPostmortemUseAfterFreeTests.cpp \
@@ -323,6 +355,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/ray_query/vktRayQueryDirectionTests.cpp \
        external/vulkancts/modules/vulkan/ray_query/vktRayQueryMiscTests.cpp \
        external/vulkancts/modules/vulkan/ray_query/vktRayQueryNonUniformArgsTests.cpp \
+       external/vulkancts/modules/vulkan/ray_query/vktRayQueryOpacityMicromapTests.cpp \
        external/vulkancts/modules/vulkan/ray_query/vktRayQueryProceduralGeometryTests.cpp \
        external/vulkancts/modules/vulkan/ray_query/vktRayQueryTests.cpp \
        external/vulkancts/modules/vulkan/ray_query/vktRayQueryTraversalControlTests.cpp \
@@ -343,6 +376,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp \
        external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingNonUniformArgsTests.cpp \
        external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingNullASTests.cpp \
+       external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingOpacityMicromapTests.cpp \
        external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingPipelineFlagsTests.cpp \
        external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingPipelineLibraryTests.cpp \
        external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingProceduralGeometryTests.cpp \
@@ -352,9 +386,11 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingTraversalControlTests.cpp \
        external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingWatertightnessTests.cpp \
        external/vulkancts/modules/vulkan/reconvergence/vktReconvergenceTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktDynamicRenderingRandomTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktDynamicRenderingTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilWriteConditionsTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassDitheringTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassLoadStoreOpNoneTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultipleSubpassesMultipleCommandBuffersTests.cpp \
@@ -363,6 +399,7 @@ LOCAL_SRC_FILES := \
        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/vktRenderPassSubpassMergeFeedbackTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassTestsUtil.cpp \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedAttachmentSparseFillingTests.cpp \
@@ -370,11 +407,22 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedClearAttachmentTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktNonRobustBufferAccessTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp \
+       external/vulkancts/modules/vulkan/robustness/vktRobustness1VertexAccessTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustnessBufferAccessTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustnessExtsTests.cpp \
+       external/vulkancts/modules/vulkan/robustness/vktRobustnessIndexAccessTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustnessTests.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustnessUtil.cpp \
        external/vulkancts/modules/vulkan/robustness/vktRobustnessVertexAccessTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktApplicationParametersTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktCommandPoolMemoryReservationTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktDeviceObjectReservationTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktFaultHandlingTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktObjectRefreshTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktPipelineCacheSCTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktPipelineIdentifierTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktSafetyCriticalApiTests.cpp \
+       external/vulkancts/modules/vulkan/sc/vktSafetyCriticalTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktAtomicOperationTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp \
@@ -479,6 +527,8 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTests.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp \
        external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp \
+       external/vulkancts/modules/vulkan/synchronization/vktGlobalPriorityQueueTests.cpp \
+       external/vulkancts/modules/vulkan/synchronization/vktGlobalPriorityQueueUtils.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp \
@@ -538,6 +588,14 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp \
        external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp \
        external/vulkancts/modules/vulkan/util/vktTypeComparisonUtil.cpp \
+       external/vulkancts/modules/vulkan/video/vktVideoBaseDecodeUtils.cpp \
+       external/vulkancts/modules/vulkan/video/vktVideoCapabilitiesTests.cpp \
+       external/vulkancts/modules/vulkan/video/vktVideoDecodeTests.cpp \
+       external/vulkancts/modules/vulkan/video/vktVideoPictureUtils.cpp \
+       external/vulkancts/modules/vulkan/video/vktVideoSessionFfmpegUtils.cpp \
+       external/vulkancts/modules/vulkan/video/vktVideoSessionNvUtils.cpp \
+       external/vulkancts/modules/vulkan/video/vktVideoTestUtils.cpp \
+       external/vulkancts/modules/vulkan/video/vktVideoTests.cpp \
        external/vulkancts/modules/vulkan/vktCustomInstancesDevices.cpp \
        external/vulkancts/modules/vulkan/vktInfoTests.cpp \
        external/vulkancts/modules/vulkan/vktShaderLibrary.cpp \
@@ -546,7 +604,9 @@ 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/vktTestPackageEntrySC.cpp \
        external/vulkancts/modules/vulkan/wsi/vktNativeObjectsUtil.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiAcquireDrmDisplayTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiColorSpaceTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiDisplayControlTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp \
@@ -562,11 +622,20 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrCopyTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFilteringTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFormatTests.cpp \
+       external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageOffsetTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrStorageImageWriteTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrTests.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp \
        external/vulkancts/modules/vulkan/ycbcr/vktYCbCrViewTests.cpp \
+       external/vulkancts/vkscpc/vkscpc.cpp \
+       external/vulkancts/vkscserver/server.cpp \
+       external/vulkancts/vkscserver/tests.cpp \
+       external/vulkancts/vkscserver/vksCacheBuilder.cpp \
+       external/vulkancts/vkscserver/vksIPC.cpp \
+       external/vulkancts/vkscserver/vksJson.cpp \
+       external/vulkancts/vkscserver/vksNetwork.cpp \
+       external/vulkancts/vkscserver/vksServices.cpp \
        framework/common/tcuApp.cpp \
        framework/common/tcuArray.cpp \
        framework/common/tcuAstcUtil.cpp \
@@ -584,6 +653,7 @@ LOCAL_SRC_FILES := \
        framework/common/tcuImageCompare.cpp \
        framework/common/tcuImageIO.cpp \
        framework/common/tcuInterval.cpp \
+       framework/common/tcuLibDrm.cpp \
        framework/common/tcuMatrix.cpp \
        framework/common/tcuMaybe.cpp \
        framework/common/tcuPlatform.cpp \
@@ -671,7 +741,7 @@ LOCAL_SRC_FILES := \
        framework/delibs/dethread/deSingleton.c \
        framework/delibs/dethread/deThreadTest.c \
        framework/delibs/dethread/unix/deMutexUnix.c \
-       framework/delibs/dethread/unix/deNamedSemaphoreUnix.c \
+       framework/delibs/dethread/unix/deSemaphoreMach.c \
        framework/delibs/dethread/unix/deSemaphoreUnix.c \
        framework/delibs/dethread/unix/deThreadLocalUnix.c \
        framework/delibs/dethread/unix/deThreadUnix.c \
@@ -904,6 +974,7 @@ LOCAL_SRC_FILES := \
        modules/gles2/functional/es2fShaderDiscardTests.cpp \
        modules/gles2/functional/es2fShaderExecuteTest.cpp \
        modules/gles2/functional/es2fShaderFragDataTests.cpp \
+       modules/gles2/functional/es2fShaderFunctionTests.cpp \
        modules/gles2/functional/es2fShaderIndexingTests.cpp \
        modules/gles2/functional/es2fShaderInvarianceTests.cpp \
        modules/gles2/functional/es2fShaderLoopTests.cpp \
@@ -1034,6 +1105,7 @@ LOCAL_SRC_FILES := \
        modules/gles3/functional/es3fShaderDerivateTests.cpp \
        modules/gles3/functional/es3fShaderDiscardTests.cpp \
        modules/gles3/functional/es3fShaderFragDataTests.cpp \
+       modules/gles3/functional/es3fShaderFunctionTests.cpp \
        modules/gles3/functional/es3fShaderIndexingTests.cpp \
        modules/gles3/functional/es3fShaderInvarianceTests.cpp \
        modules/gles3/functional/es3fShaderLoopTests.cpp \
@@ -1268,6 +1340,7 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/dynamic_state \
        $(deqp_dir)/external/vulkancts/modules/vulkan/fragment_ops \
        $(deqp_dir)/external/vulkancts/modules/vulkan/fragment_shader_interlock \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/fragment_shading_barycentric \
        $(deqp_dir)/external/vulkancts/modules/vulkan/fragment_shading_rate \
        $(deqp_dir)/external/vulkancts/modules/vulkan/geometry \
        $(deqp_dir)/external/vulkancts/modules/vulkan/image \
@@ -1288,6 +1361,7 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/reconvergence \
        $(deqp_dir)/external/vulkancts/modules/vulkan/renderpass \
        $(deqp_dir)/external/vulkancts/modules/vulkan/robustness \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/sc \
        $(deqp_dir)/external/vulkancts/modules/vulkan/shaderexecutor \
        $(deqp_dir)/external/vulkancts/modules/vulkan/shaderrender \
        $(deqp_dir)/external/vulkancts/modules/vulkan/sparse_resources \
@@ -1300,8 +1374,11 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/transform_feedback \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ubo \
        $(deqp_dir)/external/vulkancts/modules/vulkan/util \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/video \
        $(deqp_dir)/external/vulkancts/modules/vulkan/wsi \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ycbcr \
+       $(deqp_dir)/external/vulkancts/vkscpc \
+       $(deqp_dir)/external/vulkancts/vkscserver \
        $(deqp_dir)/framework/common \
        $(deqp_dir)/framework/delibs/debase \
        $(deqp_dir)/framework/delibs/decpp \