Enable -Wconversion.
Bug: 21161908
Change-Id: I42f968968e595672a685dbdc361f3e08d07e7e60
diff --git a/Android.mk b/Android.mk
index 3a6e7a0..76dc0fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -713,7 +713,9 @@
-DDEQP_TARGET_NAME=\"android\" \
-DDEQP_GLES3_RUNTIME_LOAD=1 \
-DDEQP_GLES2_RUNTIME_LOAD=1 \
- -DQP_SUPPORT_PNG=1
+ -DQP_SUPPORT_PNG=1 \
+ -Wconversion \
+ -Wno-sign-conversion
LOCAL_SHARED_LIBRARIES := \
libEGL \
diff --git a/framework/delibs/cmake/CFlags.cmake b/framework/delibs/cmake/CFlags.cmake
index d292e6e..ff25740 100644
--- a/framework/delibs/cmake/CFlags.cmake
+++ b/framework/delibs/cmake/CFlags.cmake
@@ -43,8 +43,8 @@
set(DE_3RD_PARTY_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS} -w")
set(DE_3RD_PARTY_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_FLAGS} -w")
- # \note Add -Wconversion for more warnings
- set(WARNING_FLAGS "-Wall -Wextra -Wno-long-long -Wshadow -Wundef")
+ # \note Remove -Wno-sign-conversion for more warnings
+ set(WARNING_FLAGS "-Wall -Wextra -Wno-long-long -Wshadow -Wundef -Wconversion -Wno-sign-conversion")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS} ${WARNING_FLAGS} -ansi -pedantic ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_FLAGS} ${WARNING_FLAGS}")