diff options
| author | Kristian Monsen <kristianm@google.com> | 2013-12-05 18:22:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-05 18:22:28 +0000 |
| commit | a65313f57b59aec6e32949992cac700f86eefdd6 (patch) | |
| tree | f498c5b3c8794726f149b76f1662b466e7fb2bc8 | |
| parent | 2a930a87f06bd4e13d2e0fef43d6dc5e2737e89a (diff) | |
| parent | 9b5ca5cf509bd1ed37ba692082ec6f3f180546c1 (diff) | |
| download | platform_external_iptables-idea133.tar.gz platform_external_iptables-idea133.tar.bz2 platform_external_iptables-idea133.zip | |
Merge "Silence all warnings."idea133
| -rw-r--r-- | extensions/Android.mk | 4 | ||||
| -rw-r--r-- | iptables/Android.mk | 3 | ||||
| -rw-r--r-- | libiptc/Android.mk | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/extensions/Android.mk b/extensions/Android.mk index 07694b09..02b288f6 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -15,6 +15,7 @@ MY_pf6_build_mod := $(filter-out ${MY_excluded_modules} dccp ipvs,${MY_pf6_build MY_pfx_objs := $(patsubst %,libxt_%.o,${MY_pfx_build_mod}) MY_pf4_objs := $(patsubst %,libipt_%.o,${MY_pf4_build_mod}) MY_pf6_objs := $(patsubst %,libip6t_%.o,${MY_pf6_build_mod}) +MY_warnings := -Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare -Wno-pointer-arith #---------------------------------------------------------------- # libext @@ -43,6 +44,7 @@ LOCAL_CFLAGS:=-DNO_SHARED_LIBS=1 LOCAL_CFLAGS+=-DXTABLES_INTERNAL # Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__ LOCAL_CFLAGS+=-D__ANDROID__ +LOCAL_CFLAGS += $(MY_warnings) MY_initext_func := $(addprefix xt_,${MY_pfx_build_mod}) MY_GEN_INITEXT:= $(MY_intermediates)/initext.c @@ -106,6 +108,7 @@ LOCAL_CFLAGS:=-DNO_SHARED_LIBS=1 LOCAL_CFLAGS+=-DXTABLES_INTERNAL # Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__ LOCAL_CFLAGS+=-D__ANDROID__ +LOCAL_CFLAGS += $(MY_warnings) MY_initext4_func := $(addprefix ipt_,${MY_pf4_build_mod}) MY_GEN_INITEXT4:= $(MY_intermediates)/initext4.c @@ -169,6 +172,7 @@ LOCAL_CFLAGS:=-DNO_SHARED_LIBS=1 LOCAL_CFLAGS+=-DXTABLES_INTERNAL # Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__ LOCAL_CFLAGS+=-D__ANDROID__ +LOCAL_CFLAGS += $(MY_warnings) MY_initext6_func := $(addprefix ip6t_,${MY_pf6_build_mod}) MY_GEN_INITEXT6:= $(MY_intermediates)/initext6.c diff --git a/iptables/Android.mk b/iptables/Android.mk index b50976e5..f094c9e0 100644 --- a/iptables/Android.mk +++ b/iptables/Android.mk @@ -14,6 +14,7 @@ LOCAL_CFLAGS+=-DXTABLES_INTERNAL LOCAL_CFLAGS+=-DXTABLES_LIBDIR=\"xtables_libdir_not_used\" # Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__ LOCAL_CFLAGS+=-D__ANDROID__ +LOCAL_CFLAGS += -Wno-sign-compare -Wno-pointer-arith -Wno-type-limits -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered LOCAL_LDFLAGS:=-version-info 6:0:0 LOCAL_SRC_FILES:= \ @@ -37,6 +38,7 @@ LOCAL_CFLAGS+=-DALL_INCLUSIVE LOCAL_CFLAGS+=-DXTABLES_INTERNAL # 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_SRC_FILES:= \ iptables-standalone.c iptables.c xshared.c @@ -64,6 +66,7 @@ LOCAL_CFLAGS+=-DALL_INCLUSIVE LOCAL_CFLAGS+=-DXTABLES_INTERNAL # Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__ LOCAL_CFLAGS+=-D__ANDROID__ +LOCAL_CFLAGS += -Wno-pointer-arith -Wno-sign-compare LOCAL_SRC_FILES:= \ ip6tables-standalone.c ip6tables.c xshared.c diff --git a/libiptc/Android.mk b/libiptc/Android.mk index 85cab616..6e31c050 100644 --- a/libiptc/Android.mk +++ b/libiptc/Android.mk @@ -11,6 +11,7 @@ LOCAL_C_INCLUDES:= \ # Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__ LOCAL_CFLAGS:=-D__ANDROID__ +LOCAL_CFLAGS += -Wno-pointer-arith -Wno-unused-parameter -Wno-sign-compare -Wno-pointer-sign LOCAL_SRC_FILES:= \ libip4tc.c \ @@ -33,6 +34,7 @@ LOCAL_C_INCLUDES:= \ # Accommodate arm-eabi-4.4.3 tools that don't set __ANDROID__ LOCAL_CFLAGS:=-D__ANDROID__ +LOCAL_CFLAGS += -Wno-pointer-arith -Wno-unused-parameter -Wno-sign-compare -Wno-pointer-sign LOCAL_SRC_FILES:= \ libip6tc.c \ |