Merge "Make dhcpd admit to using BSD extensions."
diff --git a/Android.mk b/Android.mk
index 108451c..4947cbd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,15 +5,17 @@
hooks_dir := dhcpcd-hooks
hooks_target := $(etc_dir)/$(hooks_dir)
+dhcpd_cflags := -Wno-error=duplicate-decl-specifier -D_BSD_SOURCE
+# Clang complains about configure.c's comparing array with null.
+dhcpd_cflags += -Wno-tautological-pointer-compare
+
include $(CLEAR_VARS)
LOCAL_SRC_FILES := arp.c bind.c common.c control.c dhcp.c dhcpcd.c duid.c \
eloop.c if-options.c if-pref.c ipv4ll.c net.c signals.c configure.c \
if-linux.c if-linux-wireless.c lpf.c \
platform-linux.c compat/closefrom.c ifaddrs.c ipv6rs.c
-# Clang complains about configure.c's comparing array with null.
-LOCAL_CFLAGS += -Wno-tautological-pointer-compare
-LOCAL_CLANG_CFLAGS := -Wno-error=duplicate-decl-specifier
+LOCAL_CFLAGS := $(dhcpd_cflags)
LOCAL_SHARED_LIBRARIES := libc libcutils libnetutils
LOCAL_MODULE = dhcpcd
include $(BUILD_EXECUTABLE)
@@ -58,6 +60,6 @@
LOCAL_MODULE := dhcpcd_test
LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
LOCAL_SRC_FILES := dhcpcd_test.cpp dhcp.c common.c
-LOCAL_CLANG_CFLAGS := -Wno-error=duplicate-decl-specifier
+LOCAL_CFLAGS := $(dhcpd_cflags)
LOCAL_MODULE_TAGS := eng tests
include $(BUILD_NATIVE_TEST)
