summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-13 08:06:51 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-13 08:06:51 +0000
commitc04ab0df40846f7c0bbb5acd4843ae4d5c3b2c20 (patch)
tree4eaaf7b8e11b70b526dd0d4d038be6365563e23e
parent507669d9a3c8adb2b415488783efe10bf9a6b3a3 (diff)
parent68d29651a7b1b7b81822d035d222202adcf5de5d (diff)
downloadopencv-pie-gsi.tar.gz
Snap for 4393550 from 68d29651a7b1b7b81822d035d222202adcf5de5d to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r5android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1pie-vts-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: If0c0f28aaf308b41934ee19ec7b0ac1c83b02f9f
-rw-r--r--Android.mk27
1 files changed, 20 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index 4c5e09e..fe8970b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,9 @@ LOCAL_C_INCLUDES := \
$(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_C_INCLUDES := \
$(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_C_INCLUDES := \
$(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_C_INCLUDES := \
$(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_SHARED_LIBRARIES += libjpeg
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 @@ include $(LOCAL_PATH)/libopencv.mk
LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
+LOCAL_CFLAGS += -Wall -Werror
LOCAL_SRC_FILES := \
WLNonFileByteStream.cpp