X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Android.mk;h=4e7bbcf59790fe82cccbd8d11a4c678b7ddfac6a;hb=e8b9c21437637035c13f3b662e1bc2a5499cc464;hp=a947dc2aa399fae0898a05dd4e52879944d84b44;hpb=a27e5f265d6e1c8e7eb33927e3479b73b988ddbf;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/Android.mk b/Android.mk
index a947dc2..4e7bbcf 100644
--- 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 \
@@ -640,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 \
@@ -906,6 +909,8 @@ LOCAL_SRC_FILES := \
 	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/vktWsiSurfaceTests.cpp \
 	external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \
 	external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp
@@ -983,6 +988,7 @@ deqp_compile_flags := \
 	-DDEQP_GLES2_RUNTIME_LOAD=1 \
 	-DQP_SUPPORT_PNG=1 \
 	-Wconversion \
+	-fwrapv \
 	-Wno-sign-conversion
 
 LOCAL_SHARED_LIBRARIES := \
@@ -1002,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