commit 68d29651a7b1b7b81822d035d222202adcf5de5d
author Chih-hung Hsieh <chh@google.com> Thu Oct 12 01:14:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 01:14:02 2017 +0000
tree 4eaaf7b8e11b70b526dd0d4d038be6365563e23e
parent 507669d9a3c8adb2b415488783efe10bf9a6b3a3
parent b34c1e94c5e770c4e80bc621d2a84b35414d9dec

Merge "Use -Werror in external/opencv" am: 28459d52af am: ba9cf7de2d am: a1ded1f5ff
am: b34c1e94c5

Change-Id: If3aefa41ac8266061bf3e9ef2974cf15e12a42e9

Android.mk

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