Snap for 4393550 from 68d29651a7b1b7b81822d035d222202adcf5de5d to pi-release
Change-Id: If0c0f28aaf308b41934ee19ec7b0ac1c83b02f9f
diff --git a/Android.mk b/Android.mk
index 4c5e09e..fe8970b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,9 @@
$(LOCAL_PATH)/cxcore/include
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += \
+ -Wall -Werror \
+ -Wno-unused-parameter \
# cxmathfuncs.cpp has implicit cast of int struct fields.
LOCAL_CLANG_CFLAGS += -Wno-c++11-narrowing
@@ -64,10 +66,13 @@
$(LOCAL_PATH)/cv/include
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_CFLAGS += -Wno-sizeof-pointer-memaccess \
+LOCAL_CFLAGS += \
+ -Wall -Werror \
+ -Wno-sizeof-pointer-memaccess \
-Wno-deprecated-register \
-Wno-sign-compare \
- -Wno-parentheses-equality
+ -Wno-parentheses-equality \
+ -Wno-unused-variable
LOCAL_TIDY_CHECKS := $(common_local_tidy_checks)
@@ -153,7 +158,9 @@
$(LOCAL_PATH)/cvaux/include
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_CFLAGS += -Wno-unused-parameter \
+LOCAL_CFLAGS += \
+ -Wall -Werror \
+ -Wno-unused-parameter \
-Wno-logical-op-parentheses \
-Wno-dangling-else \
-Wno-missing-field-initializers \
@@ -224,8 +231,11 @@
$(LOCAL_PATH)/ml/include
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_CFLAGS += -Wno-logical-op-parentheses \
- -Wno-tautological-compare
+LOCAL_CFLAGS += \
+ -Wall -Werror \
+ -Wno-logical-op-parentheses \
+ -Wno-tautological-compare \
+ -Wno-unused-variable
LOCAL_SRC_FILES := \
ml/src/ml.cpp \
@@ -262,7 +272,9 @@
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -DHAVE_JPEG
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-logical-op-parentheses
+LOCAL_CFLAGS += \
+ -Wall -Werror \
+ -Wno-unused-parameter -Wno-logical-op-parentheses \
# grfmt_tiff.cpp has implicit cast of int struct fields.
LOCAL_CLANG_CFLAGS += -Wno-c++11-narrowing
@@ -298,6 +310,7 @@
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
+LOCAL_CFLAGS += -Wall -Werror
LOCAL_SRC_FILES := \
WLNonFileByteStream.cpp