Merge "Suppress warnings in external/iptables."
diff --git a/iptables/Android.mk b/iptables/Android.mk
index d0fd7d3..a6f2ae6 100644
--- a/iptables/Android.mk
+++ b/iptables/Android.mk
@@ -1,4 +1,13 @@
LOCAL_PATH:= $(call my-dir)
+
+commonFlags:= \
+ -Wno-missing-field-initializers \
+ -Wno-sign-compare \
+ -Wno-pointer-arith \
+ -Wno-unused-parameter \
+ -Wno-parentheses-equality \
+ -Werror
+
#----------------------------------------------------------------
# iptables
@@ -14,7 +23,7 @@
LOCAL_CFLAGS+=-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DENABLE_IPV4
# Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__
LOCAL_CFLAGS+=-D__ANDROID__
-LOCAL_CFLAGS += -Wno-sign-compare -Wno-pointer-arith
+LOCAL_CFLAGS += $(commonFlags)
LOCAL_SRC_FILES:= \
xtables-multi.c iptables-xml.c xshared.c \
@@ -51,7 +60,7 @@
LOCAL_CFLAGS+=-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DENABLE_IPV6
# Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__
LOCAL_CFLAGS+=-D__ANDROID__
-LOCAL_CFLAGS += -Wno-sign-compare -Wno-pointer-arith
+LOCAL_CFLAGS += $(commonFlags)
LOCAL_SRC_FILES:= \
xtables-multi.c iptables-xml.c xshared.c \
diff --git a/libxtables/Android.mk b/libxtables/Android.mk
index beae942..1fb44e8 100644
--- a/libxtables/Android.mk
+++ b/libxtables/Android.mk
@@ -13,7 +13,7 @@
LOCAL_CFLAGS+=-DXTABLES_INTERNAL
LOCAL_CFLAGS+=-DXTABLES_LIBDIR=\"xtables_libdir_not_used\"
LOCAL_CFLAGS+=-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DENABLE_IPV4 -DENABLE_IPV6
-LOCAL_CFLAGS += -Wno-sign-compare -Wno-pointer-arith -Wno-type-limits -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered
+LOCAL_CFLAGS += -Wno-sign-compare -Wno-pointer-arith -Wno-type-limits -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered -Wno-tautological-compare -Werror
LOCAL_LDFLAGS:=-version-info 10:0:0
LOCAL_SRC_FILES:= \
@@ -35,7 +35,7 @@
LOCAL_CFLAGS+=-DXTABLES_LIBDIR=\"xtables_libdir_not_used\"
LOCAL_CFLAGS+=-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DENABLE_IPV4 -DENABLE_IPV6
-LOCAL_CFLAGS += -Wno-sign-compare -Wno-pointer-arith -Wno-type-limits -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered
+LOCAL_CFLAGS += -Wno-sign-compare -Wno-pointer-arith -Wno-type-limits -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered -Wno-tautological-compare -Werror
LOCAL_SRC_FILES:= \
xtables.c xtoptions.c
