diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2017-02-21 18:22:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-21 18:22:18 +0000 |
| commit | 70bc36c5ebb934f094bd2135d0ff14280bcef024 (patch) | |
| tree | 616638a121772903eba4382d88e3120a426f370a | |
| parent | 3981e672228d9cfab842215a6e5753ad89e3505a (diff) | |
| parent | a1ffd5ecfa5d72c6dc4cfaf11653d61e3e9083bc (diff) | |
| download | iptables-70bc36c5ebb934f094bd2135d0ff14280bcef024.tar.gz | |
Merge "Suppress warnings in external/iptables." am: 8c7efe912f am: a4283108b9android-o-preview-1o-preview
am: a1ffd5ecfa
Change-Id: Ie6fea488de4388fecf6214d283639978ef0e3dae
| -rw-r--r-- | iptables/Android.mk | 13 | ||||
| -rw-r--r-- | libxtables/Android.mk | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/iptables/Android.mk b/iptables/Android.mk index d0fd7d36..a6f2ae6f 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+=-DXTABLES_INTERNAL 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+=-DXTABLES_INTERNAL 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 beae9420..1fb44e8d 100644 --- a/libxtables/Android.mk +++ b/libxtables/Android.mk @@ -13,7 +13,7 @@ LOCAL_CFLAGS:=-DNO_SHARED_LIBS=1 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_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_SRC_FILES:= \ xtables.c xtoptions.c |