diff options
| author | Chih-hung Hsieh <chh@google.com> | 2017-10-15 05:13:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-15 05:13:16 +0000 |
| commit | 17419e375a180d2b55274c8bf634f9ded674bd0a (patch) | |
| tree | 7b8959412a6cc6a460def69d84231cc577a79124 | |
| parent | 104f85c1d3fad18427663ba3f2428a08346ce90f (diff) | |
| parent | 8eb1c41e18c279f251fc4daa238e066568ce22e6 (diff) | |
| download | iptables-17419e375a180d2b55274c8bf634f9ded674bd0a.tar.gz | |
Merge "Use -Werror in external/iptables" am: 447f5e3dd7 am: f86d7ad9ad am: 7bf5d8cf4d
am: 8eb1c41e18
Change-Id: Iec350d976bb0c76e2a1329a06e3e9091f12aa487
| -rw-r--r-- | extensions/Android.mk | 10 | ||||
| -rw-r--r-- | libiptc/Android.mk | 15 |
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 \ |