Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...

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

diff --git a/Android.mk b/Android.mk
index 7c29c09..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 \
@@ -907,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