Merge branch '308-fix-opaque-type-indexing-array-descriptors' into 'vulkan-cts-1.0'

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

diff --git a/Android.mk b/Android.mk
index 8bcbc4f..54f77ee 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -33,6 +33,7 @@ LOCAL_SRC_FILES := \
        executor/xeXMLWriter.cpp \
        framework/common/tcuApp.cpp \
        framework/common/tcuArray.cpp \
+       framework/common/tcuAstcUtil.cpp \
        framework/common/tcuBilinearImageCompare.cpp \
        framework/common/tcuCommandLine.cpp \
        framework/common/tcuCompressedTexture.cpp \
@@ -80,6 +81,8 @@ LOCAL_SRC_FILES := \
        framework/delibs/debase/deMemory.c \
        framework/delibs/debase/deRandom.c \
        framework/delibs/debase/deString.c \
+       framework/delibs/debase/deSha1.c \
+       framework/delibs/decpp/deAppendList.cpp \
        framework/delibs/decpp/deArrayBuffer.cpp \
        framework/delibs/decpp/deArrayUtil.cpp \
        framework/delibs/decpp/deBlockBuffer.cpp \
@@ -106,6 +109,7 @@ LOCAL_SRC_FILES := \
        framework/delibs/decpp/deThreadLocal.cpp \
        framework/delibs/decpp/deThreadSafeRingBuffer.cpp \
        framework/delibs/decpp/deUniquePtr.cpp \
+       framework/delibs/decpp/deSha1.cpp \
        framework/delibs/deimage/deImage.c \
        framework/delibs/deimage/deTarga.c \
        framework/delibs/depool/deMemPool.c \
@@ -170,6 +174,7 @@ LOCAL_SRC_FILES := \
        framework/opengl/gluProgramInterfaceQuery.cpp \
        framework/opengl/gluRenderConfig.cpp \
        framework/opengl/gluRenderContext.cpp \
+       framework/opengl/gluShaderLibrary.cpp \
        framework/opengl/gluShaderProgram.cpp \
        framework/opengl/gluShaderUtil.cpp \
        framework/opengl/gluStateReset.cpp \
@@ -246,6 +251,7 @@ LOCAL_SRC_FILES := \
        framework/referencerenderer/rrVertexPacket.cpp \
        modules/egl/teglAndroidUtil.cpp \
        modules/egl/teglApiCase.cpp \
+       modules/egl/teglBufferAgeTests.cpp \
        modules/egl/teglChooseConfigReference.cpp \
        modules/egl/teglChooseConfigTests.cpp \
        modules/egl/teglClientExtensionTests.cpp \
@@ -271,7 +277,9 @@ LOCAL_SRC_FILES := \
        modules/egl/teglNativeColorMappingTests.cpp \
        modules/egl/teglNativeCoordMappingTests.cpp \
        modules/egl/teglNegativeApiTests.cpp \
+       modules/egl/teglNegativePartialUpdateTests.cpp \
        modules/egl/teglPreservingSwapTests.cpp \
+       modules/egl/teglPartialUpdateTests.cpp \
        modules/egl/teglQueryConfigTests.cpp \
        modules/egl/teglQueryContextTests.cpp \
        modules/egl/teglQuerySurfaceTests.cpp \
@@ -281,6 +289,7 @@ LOCAL_SRC_FILES := \
        modules/egl/teglSimpleConfigCase.cpp \
        modules/egl/teglSurfacelessContextTests.cpp \
        modules/egl/teglSwapBuffersTests.cpp \
+       modules/egl/teglSwapBuffersWithDamageTests.cpp \
        modules/egl/teglSyncTests.cpp \
        modules/egl/teglTestCase.cpp \
        modules/egl/teglTestPackage.cpp \
@@ -653,7 +662,9 @@ LOCAL_SRC_FILES := \
        modules/glshared/glsTextureTestUtil.cpp \
        modules/glshared/glsUniformBlockCase.cpp \
        modules/glshared/glsVertexArrayTests.cpp \
+       modules/internal/ditAstcTests.cpp \
        modules/internal/ditBuildInfoTests.cpp \
+       modules/internal/ditSRGB8ConversionTest.cpp \
        modules/internal/ditDelibsTests.cpp \
        modules/internal/ditFrameworkTests.cpp \
        modules/internal/ditImageCompareTests.cpp \
@@ -662,7 +673,8 @@ LOCAL_SRC_FILES := \
        modules/internal/ditTestLogTests.cpp \
        modules/internal/ditTestPackage.cpp \
        modules/internal/ditSeedBuilderTests.cpp \
-       modules/internal/ditTestPackageEntry.cpp
+       modules/internal/ditTestPackageEntry.cpp \
+       modules/internal/ditTextureFormatTests.cpp
 
 LOCAL_C_INCLUDES := \
        frameworks/native/opengl/include \
@@ -713,7 +725,9 @@ deqp_compile_flags := \
        -DDEQP_TARGET_NAME=\"android\" \
        -DDEQP_GLES3_RUNTIME_LOAD=1 \
        -DDEQP_GLES2_RUNTIME_LOAD=1 \
-       -DQP_SUPPORT_PNG=1
+       -DQP_SUPPORT_PNG=1 \
+       -Wconversion \
+       -Wno-sign-conversion
 
 LOCAL_SHARED_LIBRARIES := \
                libEGL \
@@ -722,13 +736,15 @@ LOCAL_SHARED_LIBRARIES := \
                liblog \
                libm \
                libc \
-               libpng \
                libz \
                libdl
 
+LOCAL_STATIC_LIBRARIES := \
+               libpng_ndk \
+
 LOCAL_CFLAGS += \
        $(deqp_compile_flags) \
-       -Wno-date-time
+       -Wno-error=date-time
 
 LOCAL_SDK_VERSION := 9
 LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
@@ -738,4 +754,8 @@ LOCAL_MULTILIB := both
 
 include $(BUILD_SHARED_LIBRARY)
 
-include $(LOCAL_PATH)/android/package/Android.mk
+
+# Build the test APKs using their own makefiles
+# include $(call all-makefiles-under,$(LOCAL_PATH)/android)
+
+include $(LOCAL_PATH)/android/package/Android.mk $(LOCAL_PATH)/android/cts/Android.mk