diff options
| author | Pyry Haulos <phaulos@google.com> | 2017-05-12 13:26:36 -0700 |
|---|---|---|
| committer | Pyry Haulos <phaulos@google.com> | 2017-05-12 13:27:21 -0700 |
| commit | 8f46e5c9f1b5a5b9afa580a32a11a69c63d0404e (patch) | |
| tree | 0468167a82018e2adaab9cb4a0a735af0ce99efa /Android.mk | |
| parent | bdfbb3240884bbed9bc79426e0fee838978d1e34 (diff) | |
| download | VK-GL-CTS-8f46e5c9f1b5a5b9afa580a32a11a69c63d0404e.tar.gz VK-GL-CTS-8f46e5c9f1b5a5b9afa580a32a11a69c63d0404e.tar.bz2 VK-GL-CTS-8f46e5c9f1b5a5b9afa580a32a11a69c63d0404e.zip | |
Import fixes from Android Vulkan CTS 1.0.2 branch
* Android copy of mustpass is updated to exclude waived tests.
* Add missing file to Android.mk
* Add -fwrapv and -Wno-delete-non-virtual-dtor to Android.mk
Change-Id: I9cdb0b0490dbad4134ad085216c3969cda40747a
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 202b83a68..966807c45 100644 --- a/Android.mk +++ b/Android.mk @@ -904,6 +904,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/vktWsiSharedPresentableImageTests.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp \ external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp \ @@ -982,6 +983,7 @@ deqp_compile_flags := \ -DDEQP_GLES2_RUNTIME_LOAD=1 \ -DQP_SUPPORT_PNG=1 \ -Wconversion \ + -fwrapv \ -Wno-sign-conversion LOCAL_SHARED_LIBRARIES := \ @@ -1001,7 +1003,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 |