Fixed incorrect calculation of GCD

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

diff --git a/Android.mk b/Android.mk
index 54a6090..666c3ef 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -83,6 +83,7 @@ LOCAL_SRC_FILES := \
        framework/common/tcuThreadUtil.cpp \
        framework/delibs/debase/deDefs.c \
        framework/delibs/debase/deFloat16.c \
+       framework/delibs/debase/deFloat16Test.c \
        framework/delibs/debase/deInt32.c \
        framework/delibs/debase/deInt32Test.c \
        framework/delibs/debase/deMath.c \
@@ -700,6 +701,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/framework/vulkan/vkDebugReportUtil.cpp \
        external/vulkancts/framework/vulkan/vkDefs.cpp \
        external/vulkancts/framework/vulkan/vkDeviceUtil.cpp \
+       external/vulkancts/framework/vulkan/vkGlslProgram.cpp \
        external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp \
        external/vulkancts/framework/vulkan/vkImageUtil.cpp \
        external/vulkancts/framework/vulkan/vkMemUtil.cpp \
@@ -724,8 +726,10 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.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 \
@@ -748,6 +752,8 @@ LOCAL_SRC_FILES := \
        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/vktDrawNegativeViewportHeightTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawShaderDrawParametersTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawSimpleTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp \
@@ -783,6 +789,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 \
@@ -800,6 +807,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 \
@@ -811,6 +819,9 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp \
        external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinTests.cpp \
@@ -835,6 +846,7 @@ 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 \
@@ -846,15 +858,19 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp \
        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/vktSpvAsmComputeShaderCase.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmUtils.cpp \
        external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp \
        external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp \
+       external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp \
@@ -862,6 +878,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp \
+       external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationCommonEdgeTests.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationCoordinatesTests.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationFractionalSpacingTests.cpp \
@@ -879,6 +896,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 \
@@ -888,14 +906,17 @@ LOCAL_SRC_FILES := \
        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/vktExternalMemoryUtil.cpp \
        external/vulkancts/modules/vulkan/vktInfoTests.cpp \
-       external/vulkancts/modules/vulkan/vktRenderPassTests.cpp \
        external/vulkancts/modules/vulkan/vktShaderLibrary.cpp \
        external/vulkancts/modules/vulkan/vktTestCase.cpp \
        external/vulkancts/modules/vulkan/vktTestCaseUtil.cpp \
        external/vulkancts/modules/vulkan/vktTestGroupUtil.cpp \
        external/vulkancts/modules/vulkan/vktTestPackage.cpp \
        external/vulkancts/modules/vulkan/vktTestPackageEntry.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp \
+       external/vulkancts/modules/vulkan/wsi/vktWsiSharedPresentableImageTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp
@@ -953,6 +974,7 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/pipeline \
        $(deqp_dir)/external/vulkancts/modules/vulkan/query_pool \
        $(deqp_dir)/external/vulkancts/modules/vulkan/rasterization \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/renderpass \
        $(deqp_dir)/external/vulkancts/modules/vulkan/shaderexecutor \
        $(deqp_dir)/external/vulkancts/modules/vulkan/shaderrender \
        $(deqp_dir)/external/vulkancts/modules/vulkan/sparse_resources \
@@ -973,6 +995,7 @@ deqp_compile_flags := \
        -DDEQP_GLES2_RUNTIME_LOAD=1 \
        -DQP_SUPPORT_PNG=1 \
        -Wconversion \
+       -fwrapv \
        -Wno-sign-conversion
 
 LOCAL_SHARED_LIBRARIES := \
@@ -992,7 +1015,7 @@ LOCAL_CFLAGS += \
        $(deqp_compile_flags)
 
 LOCAL_SDK_VERSION := 22
-LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -fwrapv
+LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -Wno-delete-non-virtual-dtor
 LOCAL_NDK_STL_VARIANT := gnustl_static
 LOCAL_RTTI_FLAG := -frtti -fexceptions
 LOCAL_MULTILIB := both