Merge "Use -Werror in external/iptables" am: 447f5e3dd7
am: f86d7ad9ad
Change-Id: If615b6010d9419e64dffd4ece5bb7cf47ce40dbf
diff --git a/extensions/Android.mk b/extensions/Android.mk
index b41cf38..74f1cab 100644
--- a/extensions/Android.mk
+++ b/extensions/Android.mk
@@ -17,10 +17,14 @@
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 2041a99..d034175 100644
--- a/libiptc/Android.mk
+++ b/libiptc/Android.mk
@@ -11,7 +11,12 @@
# 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 @@
# 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 \
