Improve tcuTexture performance by caching pixel size.

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

diff --git a/Android.mk b/Android.mk
index 3e5d1c2..4d3e6d5 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@ delibs_dir := $(LOCAL_PATH)/framework/delibs
 deqp_dir := $(LOCAL_PATH)/
 
 LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := libtestercore
+LOCAL_MODULE := libdeqp
 LOCAL_SRC_FILES := \
        execserver/xsDefs.cpp \
        execserver/xsExecutionServer.cpp \
@@ -63,6 +63,8 @@ LOCAL_SRC_FILES := \
        framework/common/tcuTextureUtil.cpp \
        framework/common/tcuTexVerifierUtil.cpp \
        framework/common/tcuThreadUtil.cpp \
+       framework/common/tcuSeedBuilder.cpp \
+       framework/common/tcuMaybe.cpp \
        framework/delibs/debase/deDefs.c \
        framework/delibs/debase/deFloat16.c \
        framework/delibs/debase/deInt32.c \
@@ -132,7 +134,7 @@ LOCAL_SRC_FILES := \
        framework/egl/egluDefs.cpp \
        framework/egl/egluGLContextFactory.cpp \
        framework/egl/egluGLFunctionLoader.cpp \
-       framework/egl/egluHeaderWrapper.cpp \
+       framework/egl/egluGLUtil.cpp \
        framework/egl/egluNativeDisplay.cpp \
        framework/egl/egluNativePixmap.cpp \
        framework/egl/egluNativeWindow.cpp \
@@ -141,7 +143,9 @@ LOCAL_SRC_FILES := \
        framework/egl/egluStrUtil.cpp \
        framework/egl/egluUnique.cpp \
        framework/egl/egluUtil.cpp \
-       framework/egl/tcuEgl.cpp \
+       framework/egl/wrapper/eglwDefs.cpp \
+       framework/egl/wrapper/eglwFunctions.cpp \
+       framework/egl/wrapper/eglwLibrary.cpp \
        framework/opengl/gluCallLogWrapper.cpp \
        framework/opengl/gluContextFactory.cpp \
        framework/opengl/gluContextInfo.cpp \
@@ -183,6 +187,7 @@ LOCAL_SRC_FILES := \
        framework/platform/android/tcuAndroidMain.cpp \
        framework/platform/android/tcuAndroidNativeActivity.cpp \
        framework/platform/android/tcuAndroidPlatform.cpp \
+       framework/platform/android/tcuAndroidPlatformCapabilityQueryJNI.cpp \
        framework/platform/android/tcuAndroidRenderActivity.cpp \
        framework/platform/android/tcuAndroidTestActivity.cpp \
        framework/platform/android/tcuAndroidUtil.cpp \
@@ -229,13 +234,16 @@ LOCAL_SRC_FILES := \
        framework/referencerenderer/rrVertexAttrib.cpp \
        framework/referencerenderer/rrVertexPacket.cpp \
        modules/gles31/functional/es31fAdvancedBlendTests.cpp \
+       modules/gles31/functional/es31fAndroidExtensionPackES31ATests.cpp \
        modules/gles31/functional/es31fAtomicCounterTests.cpp \
        modules/gles31/functional/es31fBasicComputeShaderTests.cpp \
        modules/gles31/functional/es31fBuiltinPrecisionTests.cpp \
        modules/gles31/functional/es31fComputeShaderBuiltinVarTests.cpp \
        modules/gles31/functional/es31fDebugTests.cpp \
        modules/gles31/functional/es31fDrawTests.cpp \
+       modules/gles31/functional/es31fFboColorbufferTests.cpp \
        modules/gles31/functional/es31fFboNoAttachmentTests.cpp \
+       modules/gles31/functional/es31fFboTestCase.cpp \
        modules/gles31/functional/es31fFboTestUtil.cpp \
        modules/gles31/functional/es31fFunctionalTests.cpp \
        modules/gles31/functional/es31fGeometryShaderTests.cpp \
@@ -253,6 +261,7 @@ LOCAL_SRC_FILES := \
        modules/gles31/functional/es31fNegativeTextureApiTests.cpp \
        modules/gles31/functional/es31fNegativeVertexArrayApiTests.cpp \
        modules/gles31/functional/es31fOpaqueTypeIndexingTests.cpp \
+       modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp \
        modules/gles31/functional/es31fProgramInterfaceDefinition.cpp \
        modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp \
        modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp \
@@ -281,6 +290,7 @@ LOCAL_SRC_FILES := \
        modules/gles31/functional/es31fTessellationGeometryInteractionTests.cpp \
        modules/gles31/functional/es31fTessellationTests.cpp \
        modules/gles31/functional/es31fTextureBufferTests.cpp \
+       modules/gles31/functional/es31fTextureFilteringTests.cpp \
        modules/gles31/functional/es31fTextureFormatTests.cpp \
        modules/gles31/functional/es31fTextureGatherTests.cpp \
        modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp \
@@ -409,6 +419,7 @@ LOCAL_SRC_FILES := \
        modules/gles3/functional/es3fVertexTextureTests.cpp \
        modules/gles3/performance/es3pBlendTests.cpp \
        modules/gles3/performance/es3pBufferDataUploadTests.cpp \
+       modules/gles3/performance/es3pDepthTests.cpp \
        modules/gles3/performance/es3pPerformanceTests.cpp \
        modules/gles3/performance/es3pRedundantStateChangeTests.cpp \
        modules/gles3/performance/es3pShaderCompilationCases.cpp \
@@ -469,7 +480,17 @@ LOCAL_SRC_FILES := \
        modules/glshared/glsTextureBufferCase.cpp \
        modules/glshared/glsTextureTestUtil.cpp \
        modules/glshared/glsUniformBlockCase.cpp \
-       modules/glshared/glsVertexArrayTests.cpp
+       modules/glshared/glsVertexArrayTests.cpp \
+       modules/internal/ditBuildInfoTests.cpp \
+       modules/internal/ditDelibsTests.cpp \
+       modules/internal/ditFrameworkTests.cpp \
+       modules/internal/ditImageCompareTests.cpp \
+       modules/internal/ditImageIOTests.cpp \
+       modules/internal/ditTestCase.cpp \
+       modules/internal/ditTestLogTests.cpp \
+       modules/internal/ditTestPackage.cpp \
+       modules/internal/ditSeedBuilderTests.cpp \
+       modules/internal/ditTestPackageEntry.cpp
 
 LOCAL_C_INCLUDES := \
        frameworks/native/opengl/include \
@@ -485,6 +506,7 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/framework/qphelper \
        $(deqp_dir)/framework/platform/android \
        $(deqp_dir)/framework/egl \
+       $(deqp_dir)/framework/egl/wrapper \
        $(deqp_dir)/framework/opengl \
        $(deqp_dir)/framework/opengl/wrapper \
        $(deqp_dir)/framework/referencerenderer \
@@ -533,6 +555,12 @@ LOCAL_SDK_VERSION := 9
 LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
 LOCAL_NDK_STL_VARIANT := gnustl_static
 LOCAL_RTTI_FLAG := -frtti -fexceptions
+LOCAL_MULTILIB := both
+
+# b/18934246, failed to link libtestercore for clang mips.
+ifeq ($(TARGET_ARCH),mips)
+  LOCAL_CLANG := false
+endif
 
 include $(BUILD_SHARED_LIBRARY)