commit 9259dfa16d5af036b02af3388c40579314056b25
author Elliott Hughes <enh@google.com> Thu Feb 04 21:24:40 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 04 21:24:40 2016 +0000
tree 7f82ca93a29e04c530b1f2f1222dea04ed63481c
parent fdf8e83818340ee2efa54654fb294da919d1a4b1
parent 0de983a09d47741c441b2f9fbe1f22afcb0c7d79

Merge "Silence warnings for iputils."

Android.mk

diff --git a/Android.mk b/Android.mk
index 236ab12..5f5d72b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,35 +1,40 @@
 LOCAL_PATH:= $(call my-dir)
 
+iputils_cflags := \
+  -Wno-missing-field-initializers \
+  -Wno-sign-compare \
+  -Wno-unused-parameter \
+
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= ping.c ping_common.c
+LOCAL_CFLAGS := $(iputils_cflags)
 LOCAL_MODULE := ping
-LOCAL_CFLAGS := -DWITHOUT_IFADDRS -Wno-sign-compare
+LOCAL_SRC_FILES := ping.c ping_common.c
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
-LOCAL_CFLAGS := -DWITHOUT_IFADDRS -Wno-sign-compare
-LOCAL_SRC_FILES := ping6.c ping_common.c
+LOCAL_CFLAGS := $(iputils_cflags)
 LOCAL_MODULE := ping6
 LOCAL_SHARED_LIBRARIES := libcrypto
+LOCAL_SRC_FILES := ping6.c ping_common.c
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
-LOCAL_CFLAGS := -Wno-sign-compare
-LOCAL_SRC_FILES := tracepath.c
+LOCAL_CFLAGS := $(iputils_cflags)
 LOCAL_MODULE := tracepath
 LOCAL_MODULE_TAGS := debug
+LOCAL_SRC_FILES := tracepath.c
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
-LOCAL_CFLAGS := -Wno-sign-compare
-LOCAL_SRC_FILES := tracepath6.c
+LOCAL_CFLAGS := $(iputils_cflags)
 LOCAL_MODULE := tracepath6
 LOCAL_MODULE_TAGS := debug
+LOCAL_SRC_FILES := tracepath6.c
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
-LOCAL_CFLAGS := -Wno-sign-compare
-LOCAL_SRC_FILES := traceroute6.c
+LOCAL_CFLAGS := $(iputils_cflags)
 LOCAL_MODULE := traceroute6
 LOCAL_MODULE_TAGS := debug
+LOCAL_SRC_FILES := traceroute6.c
 include $(BUILD_EXECUTABLE)