Modify spirv_assembly tests adding dependency on 16bit_storage extension

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

diff --git a/Android.mk b/Android.mk
index 0ae3320..e15fc9c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,13 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+# The clang-tidy google-explicit-constructor warning is issued to nearly
+# 1000 conversion constructors in this project. They are from more than
+# 500 source files. Most of them should be declared explicit, but many
+# of them need to be implicit. Until we correctly mark them as explicit
+# or NOLINT(implicit), we suppress the google-explicit-constructor check.
+LOCAL_TIDY_CHECKS := -google-explicit-constructor
+
 delibs_dir := $(LOCAL_PATH)/framework/delibs
 deqp_dir := $(LOCAL_PATH)/
 
@@ -60,6 +67,7 @@ LOCAL_SRC_FILES := \
        framework/common/tcuSeedBuilder.cpp \
        framework/common/tcuStringTemplate.cpp \
        framework/common/tcuSurface.cpp \
+       framework/common/tcuSurfaceAccess.cpp \
        framework/common/tcuTestCase.cpp \
        framework/common/tcuTestContext.cpp \
        framework/common/tcuTestHierarchyIterator.cpp \
@@ -75,6 +83,7 @@ LOCAL_SRC_FILES := \
        framework/common/tcuThreadUtil.cpp \
        framework/delibs/debase/deDefs.c \
        framework/delibs/debase/deFloat16.c \
+       framework/delibs/debase/deFloat16Test.c \
        framework/delibs/debase/deInt32.c \
        framework/delibs/debase/deInt32Test.c \
        framework/delibs/debase/deMath.c \
@@ -181,6 +190,7 @@ LOCAL_SRC_FILES := \
        framework/opengl/gluStateReset.cpp \
        framework/opengl/gluStrUtil.cpp \
        framework/opengl/gluTexture.cpp \
+       framework/opengl/gluTextureTestUtil.cpp \
        framework/opengl/gluTextureUtil.cpp \
        framework/opengl/gluVarType.cpp \
        framework/opengl/gluVarTypeUtil.cpp \
@@ -687,12 +697,15 @@ LOCAL_SRC_FILES := \
        external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp \
        external/vulkancts/framework/vulkan/vkApiVersion.cpp \
        external/vulkancts/framework/vulkan/vkBinaryRegistry.cpp \
+       external/vulkancts/framework/vulkan/vkBufferWithMemory.cpp \
        external/vulkancts/framework/vulkan/vkBuilderUtil.cpp \
        external/vulkancts/framework/vulkan/vkDebugReportUtil.cpp \
        external/vulkancts/framework/vulkan/vkDefs.cpp \
        external/vulkancts/framework/vulkan/vkDeviceUtil.cpp \
+       external/vulkancts/framework/vulkan/vkGlslProgram.cpp \
        external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp \
        external/vulkancts/framework/vulkan/vkImageUtil.cpp \
+       external/vulkancts/framework/vulkan/vkImageWithMemory.cpp \
        external/vulkancts/framework/vulkan/vkMemUtil.cpp \
        external/vulkancts/framework/vulkan/vkNullDriver.cpp \
        external/vulkancts/framework/vulkan/vkPlatform.cpp \
@@ -715,27 +728,33 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiDescriptorPoolTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp \
        external/vulkancts/modules/vulkan/api/vktApiFillBufferTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiGranularityTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp \
+       external/vulkancts/modules/vulkan/api/vktApiNullHandleTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp \
        external/vulkancts/modules/vulkan/api/vktApiTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingModelTests.cpp \
        external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp \
        external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp \
-       external/vulkancts/modules/vulkan/clipping/vktClippingUtil.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeTests.cpp \
        external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp \
+       external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawBufferObjectUtil.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp \
+       external/vulkancts/modules/vulkan/draw/vktDrawShaderDrawParametersTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawSimpleTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp \
@@ -745,30 +764,55 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateVPTests.cpp \
+       external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp \
+       external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsMakeUtil.cpp \
+       external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorMultiViewportTests.cpp \
+       external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsScissorTests.cpp \
+       external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryBasicClass.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryBasicGeometryShaderTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryEmitGeometryShaderTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryInputGeometryShaderTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryInstancedRenderingTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryLayeredRenderingTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryTests.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp \
+       external/vulkancts/modules/vulkan/geometry/vktGeometryVaryingGeometryShaderTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp \
+       external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp \
        external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp \
+       external/vulkancts/modules/vulkan/image/vktImageLoadStoreUtil.cpp \
+       external/vulkancts/modules/vulkan/image/vktImageMultisampleLoadStoreTests.cpp \
+       external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageSizeTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageTests.cpp \
        external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp \
        external/vulkancts/modules/vulkan/image/vktImageTexture.cpp \
+       external/vulkancts/modules/vulkan/image/vktImageTranscodingSupportTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp \
+       external/vulkancts/modules/vulkan/memory/vktMemoryBindingTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp \
+       external/vulkancts/modules/vulkan/memory/vktMemoryRequirementsTests.cpp \
        external/vulkancts/modules/vulkan/memory/vktMemoryTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineClearUtil.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp \
-       external/vulkancts/modules/vulkan/pipeline/vktPipelineEarlyFragmentTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMakeUtil.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleImageTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleInterpolationTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTestsUtil.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.cpp \
+       external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp \
        external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantUtil.cpp \
@@ -780,6 +824,9 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolOcclusionTests.cpp \
        external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp \
        external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleResolveTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp \
+       external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinTests.cpp \
@@ -787,8 +834,8 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderIntegerFunctionTests.cpp \
        external/vulkancts/modules/vulkan/shaderexecutor/vktShaderPackingFunctionTests.cpp \
-       external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp \
+       external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp \
        external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp \
@@ -804,25 +851,31 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp \
+       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferTests.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseBinding.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp \
-       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp \
+       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.cpp \
+       external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp \
        external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp \
        external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTests.cpp \
+       external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmUtils.cpp \
        external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp \
        external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp \
+       external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp \
@@ -830,6 +883,7 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTests.cpp \
        external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp \
+       external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationCommonEdgeTests.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationCoordinatesTests.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationFractionalSpacingTests.cpp \
@@ -845,20 +899,40 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp \
        external/vulkancts/modules/vulkan/tessellation/vktTessellationWindingTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktSampleVerifier.cpp \
+       external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureFilteringAnisotropyTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureMipmapTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureShadowTests.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp \
+       external/vulkancts/modules/vulkan/texture/vktTextureTests.cpp \
        external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp \
        external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp \
        external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp \
+       external/vulkancts/modules/vulkan/vktExternalMemoryUtil.cpp \
+       external/vulkancts/modules/vulkan/vktDrawUtil.cpp \
        external/vulkancts/modules/vulkan/vktInfoTests.cpp \
-       external/vulkancts/modules/vulkan/vktRenderPassTests.cpp \
        external/vulkancts/modules/vulkan/vktShaderLibrary.cpp \
        external/vulkancts/modules/vulkan/vktTestCase.cpp \
        external/vulkancts/modules/vulkan/vktTestCaseUtil.cpp \
        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/vktWsiSharedPresentableImageTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp \
        external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \
-       external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp
+       external/vulkancts/modules/vulkan/wsi/vktWsiTests.cpp \
+       external/vulkancts/modules/vulkan/ycbcr/vktYCbCrConversionTests.cpp \
+       external/vulkancts/modules/vulkan/ycbcr/vktYCbCrCopyTests.cpp \
+       external/vulkancts/modules/vulkan/ycbcr/vktYCbCrFormatTests.cpp \
+       external/vulkancts/modules/vulkan/ycbcr/vktYCbCrImageQueryTests.cpp \
+       external/vulkancts/modules/vulkan/ycbcr/vktYCbCrTests.cpp \
+       external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp \
+       external/vulkancts/modules/vulkan/ycbcr/vktYCbCrViewTests.cpp
 
 LOCAL_C_INCLUDES := \
        frameworks/native/opengl/include \
@@ -906,11 +980,14 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/compute \
        $(deqp_dir)/external/vulkancts/modules/vulkan/draw \
        $(deqp_dir)/external/vulkancts/modules/vulkan/dynamic_state \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/fragment_ops \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/geometry \
        $(deqp_dir)/external/vulkancts/modules/vulkan/image \
        $(deqp_dir)/external/vulkancts/modules/vulkan/memory \
        $(deqp_dir)/external/vulkancts/modules/vulkan/pipeline \
        $(deqp_dir)/external/vulkancts/modules/vulkan/query_pool \
        $(deqp_dir)/external/vulkancts/modules/vulkan/rasterization \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/renderpass \
        $(deqp_dir)/external/vulkancts/modules/vulkan/shaderexecutor \
        $(deqp_dir)/external/vulkancts/modules/vulkan/shaderrender \
        $(deqp_dir)/external/vulkancts/modules/vulkan/sparse_resources \
@@ -918,14 +995,13 @@ LOCAL_C_INCLUDES := \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ssbo \
        $(deqp_dir)/external/vulkancts/modules/vulkan/synchronization \
        $(deqp_dir)/external/vulkancts/modules/vulkan/tessellation \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/texture \
        $(deqp_dir)/external/vulkancts/modules/vulkan/ubo \
-       $(deqp_dir)/external/vulkancts/modules/vulkan/wsi
+       $(deqp_dir)/external/vulkancts/modules/vulkan/wsi \
+       $(deqp_dir)/external/vulkancts/modules/vulkan/ycbcr \
 
 deqp_compile_flags := \
-       -DDEQP_SUPPORT_EGL=1 \
        -DDEQP_SUPPORT_GLES1=1 \
-       -DDEQP_SUPPORT_GLES2=1 \
-       -DDEQP_SUPPORT_GLES3=1 \
        -DDE_ANDROID_API=9 \
        -D_XOPEN_SOURCE=600 \
        -DDEQP_TARGET_NAME=\"android\" \
@@ -933,6 +1009,7 @@ deqp_compile_flags := \
        -DDEQP_GLES2_RUNTIME_LOAD=1 \
        -DQP_SUPPORT_PNG=1 \
        -Wconversion \
+       -fwrapv \
        -Wno-sign-conversion
 
 LOCAL_SHARED_LIBRARIES := \
@@ -951,8 +1028,8 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_CFLAGS += \
        $(deqp_compile_flags)
 
-LOCAL_SDK_VERSION := 9
-LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -fwrapv
+LOCAL_SDK_VERSION := 22
+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
@@ -963,4 +1040,4 @@ include $(BUILD_SHARED_LIBRARY)
 # Build the test APKs using their own makefiles
 # include $(call all-makefiles-under,$(LOCAL_PATH)/android)
 
-include $(LOCAL_PATH)/android/package/Android.mk
+include $(LOCAL_PATH)/android/package/Android.mk $(LOCAL_PATH)/android/cts/Android.mk