Merge Vulkan CTS 1.0.2.2 into aosp/master

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

diff --git a/Android.mk b/Android.mk
index 70666cc..4e7bbcf 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -270,6 +270,7 @@ LOCAL_SRC_FILES := \
        modules/egl/teglCreateContextExtTests.cpp \
        modules/egl/teglCreateContextTests.cpp \
        modules/egl/teglCreateSurfaceTests.cpp \
+       modules/egl/teglGetFrameTimestampsTests.cpp \
        modules/egl/teglGetProcAddressTests.cpp \
        modules/egl/teglGLES1RenderUtil.cpp \
        modules/egl/teglGLES2RenderUtil.cpp \
@@ -295,6 +296,7 @@ LOCAL_SRC_FILES := \
        modules/egl/teglQuerySurfaceTests.cpp \
        modules/egl/teglRenderCase.cpp \
        modules/egl/teglRenderTests.cpp \
+       modules/egl/teglRobustnessTests.cpp \
        modules/egl/teglResizeTests.cpp \
        modules/egl/teglSimpleConfigCase.cpp \
        modules/egl/teglSurfacelessContextTests.cpp \
@@ -589,7 +591,10 @@ LOCAL_SRC_FILES := \
        modules/gles31/functional/es31fNegativeShaderDirectiveTests.cpp \
        modules/gles31/functional/es31fNegativeShaderFunctionTests.cpp \
        modules/gles31/functional/es31fNegativeShaderImageLoadStoreTests.cpp \
+       modules/gles31/functional/es31fNegativeShaderStorageTests.cpp \
        modules/gles31/functional/es31fNegativeStateApiTests.cpp \
+       modules/gles31/functional/es31fNegativeSSBOBlockTests.cpp \
+       modules/gles31/functional/es31fNegativeTessellationTests.cpp \
        modules/gles31/functional/es31fNegativeTestShared.cpp \
        modules/gles31/functional/es31fNegativeTextureApiTests.cpp \
        modules/gles31/functional/es31fNegativeVertexArrayApiTests.cpp \
@@ -637,6 +642,7 @@ LOCAL_SRC_FILES := \
        modules/gles31/functional/es31fVertexAttributeBindingTests.cpp \
        modules/gles31/functional/es31fCopyImageTests.cpp \
        modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp \
+       modules/gles31/functional/es31fSRGBDecodeTests.cpp \
        modules/gles31/stress/es31sDrawTests.cpp \
        modules/gles31/stress/es31sStressTests.cpp \
        modules/gles31/stress/es31sTessellationGeometryInteractionTests.cpp \
@@ -904,6 +910,7 @@ LOCAL_SRC_FILES := \
        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/vktWsiSurfaceTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp
@@ -981,6 +988,7 @@ deqp_compile_flags := \
        -DDEQP_GLES2_RUNTIME_LOAD=1 \
        -DQP_SUPPORT_PNG=1 \
        -Wconversion \
+       -fwrapv \
        -Wno-sign-conversion
 
 LOCAL_SHARED_LIBRARIES := \
@@ -1000,7 +1008,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