Fix Android builds compiler flags

- Move -fwrapv to common flags
- Add -Wno-delete-non-virtual-dtor

Bug: 34676963
Test: Build deqp with the AOSP ARM64 target
Change-Id: I21e4c70ef5f2ebe7d306d5a4dcbb52933c4dff6d

diff --git a/Android.mk b/Android.mk
index a947dc2..1551102 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -983,6 +983,7 @@ deqp_compile_flags := \
        -DDEQP_GLES2_RUNTIME_LOAD=1 \
        -DQP_SUPPORT_PNG=1 \
        -Wconversion \
+       -fwrapv \
        -Wno-sign-conversion
 
 LOCAL_SHARED_LIBRARIES := \
@@ -1002,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