aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2017-10-15 02:44:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-15 02:44:41 +0000
commitf86d7ad9adfead8f829257f72371c799084e3199 (patch)
tree7b8959412a6cc6a460def69d84231cc577a79124
parent896f87c1302794d85287354e7f048d8a06ee3733 (diff)
parent447f5e3dd768edd2cee7125cea6b0119eb3e06e6 (diff)
downloadplatform_external_iptables-f86d7ad9adfead8f829257f72371c799084e3199.tar.gz
platform_external_iptables-f86d7ad9adfead8f829257f72371c799084e3199.tar.bz2
platform_external_iptables-f86d7ad9adfead8f829257f72371c799084e3199.zip
Merge "Use -Werror in external/iptables"
am: 447f5e3dd7 Change-Id: I80a90b6143bbf53172d8b149c8e34584ad044063
-rw-r--r--extensions/Android.mk10
-rw-r--r--libiptc/Android.mk15
2 files changed, 20 insertions, 5 deletions
diff --git a/extensions/Android.mk b/extensions/Android.mk
index b41cf380..74f1caba 100644
--- a/extensions/Android.mk
+++ b/extensions/Android.mk
@@ -17,10 +17,14 @@ MY_pf4_objs := $(patsubst %,libipt_%.o,${MY_pf4_build_mod})
MY_pf6_objs := $(patsubst %,libip6t_%.o,${MY_pf6_build_mod})
# libxt_recent.c:202:11: error: address of array 'info->name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
MY_warnings := \
- -Wno-unused-parameter -Wno-missing-field-initializers \
- -Wno-sign-compare -Wno-pointer-arith \
+ -Wall -Werror \
+ -Wno-format \
+ -Wno-missing-field-initializers \
+ -Wno-pointer-arith \
-Wno-pointer-bool-conversion \
- -Wno-tautological-pointer-compare
+ -Wno-sign-compare \
+ -Wno-tautological-pointer-compare \
+ -Wno-unused-parameter \
libext_suffix :=
libext_prefix := xt
diff --git a/libiptc/Android.mk b/libiptc/Android.mk
index 2041a998..d034175e 100644
--- a/libiptc/Android.mk
+++ b/libiptc/Android.mk
@@ -11,7 +11,12 @@ LOCAL_C_INCLUDES:= \
# Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__
LOCAL_CFLAGS:=-D__ANDROID__
LOCAL_CFLAGS+=-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DENABLE_IPV4 -DENABLE_IPV6
-LOCAL_CFLAGS += -Wno-pointer-arith -Wno-unused-parameter -Wno-sign-compare -Wno-pointer-sign
+LOCAL_CFLAGS += \
+ -Wall -Werror \
+ -Wno-pointer-arith \
+ -Wno-pointer-sign \
+ -Wno-sign-compare \
+ -Wno-unused-parameter \
LOCAL_SRC_FILES:= \
libip4tc.c \
@@ -35,7 +40,13 @@ LOCAL_C_INCLUDES:= \
# Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__
LOCAL_CFLAGS:=-D__ANDROID__
LOCAL_CFLAGS+=-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DENABLE_IPV4 -DENABLE_IPV6
-LOCAL_CFLAGS += -Wno-pointer-arith -Wno-unused-parameter -Wno-sign-compare -Wno-pointer-sign
+LOCAL_CFLAGS += \
+ -Wall -Werror \
+ -Wno-pointer-arith \
+ -Wno-pointer-sign \
+ -Wno-sign-compare \
+ -Wno-unused-function \
+ -Wno-unused-parameter \
LOCAL_SRC_FILES:= \
libip6tc.c \