Merge changes I688d84e5,Icce01201

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

diff --git a/Android.mk b/Android.mk
index 94329ff..e1beb99 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -32,22 +32,26 @@ LOCAL_SRC_FILES := \
        executor/xeXMLParser.cpp \
        executor/xeXMLWriter.cpp \
        framework/common/tcuApp.cpp \
+       framework/common/tcuArray.cpp \
        framework/common/tcuBilinearImageCompare.cpp \
        framework/common/tcuCommandLine.cpp \
        framework/common/tcuCompressedTexture.cpp \
        framework/common/tcuCPUWarmup.cpp \
        framework/common/tcuDefs.cpp \
        framework/common/tcuFactoryRegistry.cpp \
+       framework/common/tcuFloat.cpp \
        framework/common/tcuFloatFormat.cpp \
        framework/common/tcuFunctionLibrary.cpp \
        framework/common/tcuFuzzyImageCompare.cpp \
        framework/common/tcuImageCompare.cpp \
        framework/common/tcuImageIO.cpp \
        framework/common/tcuInterval.cpp \
+       framework/common/tcuMatrix.cpp \
        framework/common/tcuPlatform.cpp \
        framework/common/tcuRandomValueIterator.cpp \
        framework/common/tcuRenderTarget.cpp \
        framework/common/tcuResource.cpp \
+       framework/common/tcuResultCollector.cpp \
        framework/common/tcuRGBA.cpp \
        framework/common/tcuEither.cpp \
        framework/common/tcuStringTemplate.cpp \
@@ -250,7 +254,13 @@ LOCAL_SRC_FILES := \
        modules/gles31/functional/es31fGeometryShaderTests.cpp \
        modules/gles31/functional/es31fIndirectComputeDispatchTests.cpp \
        modules/gles31/functional/es31fIntegerStateQueryTests.cpp \
+       modules/gles31/functional/es31fBooleanStateQueryTests.cpp \
+       modules/gles31/functional/es31fIndexedStateQueryTests.cpp \
        modules/gles31/functional/es31fInternalFormatQueryTests.cpp \
+       modules/gles31/functional/es31fTextureStateQueryTests.cpp \
+       modules/gles31/functional/es31fFramebufferDefaultStateQueryTests.cpp \
+       modules/gles31/functional/es31fProgramPipelineStateQueryTests.cpp \
+       modules/gles31/functional/es31fProgramStateQueryTests.cpp \
        modules/gles31/functional/es31fLayoutBindingTests.cpp \
        modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp \
        modules/gles31/functional/es31fMultisampleTests.cpp \
@@ -478,6 +488,7 @@ LOCAL_SRC_FILES := \
        modules/glshared/glsShaderPerformanceCase.cpp \
        modules/glshared/glsShaderPerformanceMeasurer.cpp \
        modules/glshared/glsShaderRenderCase.cpp \
+       modules/glshared/glsStateQueryUtil.cpp \
        modules/glshared/glsStateChangePerfTestCases.cpp \
        modules/glshared/glsTextureBufferCase.cpp \
        modules/glshared/glsTextureTestUtil.cpp \