diff options
| author | Chih-hung Hsieh <chh@google.com> | 2017-10-11 23:16:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 23:16:34 +0000 |
| commit | a1ded1f5ffb002c4514344a178fcc2a2eff44992 (patch) | |
| tree | 4eaaf7b8e11b70b526dd0d4d038be6365563e23e | |
| parent | 507669d9a3c8adb2b415488783efe10bf9a6b3a3 (diff) | |
| parent | ba9cf7de2d6891b012e78a12c79f6022f25bf735 (diff) | |
| download | opencv-a1ded1f5ffb002c4514344a178fcc2a2eff44992.tar.gz | |
Merge "Use -Werror in external/opencv" am: 28459d52af
am: ba9cf7de2d
Change-Id: I4ad12c36885b8fc96efdba8cfc3247e512ac0018
| -rw-r--r-- | Android.mk | 27 |
1 files changed, 20 insertions, 7 deletions
@@ -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 |