diff options
author | Elliott Hughes <enh@google.com> | 2016-05-13 17:58:41 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-13 17:58:41 +0000 |
commit | 2ad0f1bb56b50045d8112a9dba3e2e6c6e466b55 (patch) | |
tree | 4aa0d28432a478cfbcb65797ae298adf1ee74edb | |
parent | 01a45a5883c71a4acbd36262b5f492a3d0d42d50 (diff) | |
parent | 63b461288dd4ea9d6d1b3f35a7b777593a134f46 (diff) | |
download | dhcpcd-nougat-mr1-wear-release.tar.gz |
Merge "Make dhcpd admit to using BSD extensions."HEADandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2mastermain
-rw-r--r-- | Android.mk | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -5,15 +5,17 @@ etc_dir := $(TARGET_OUT)/etc/dhcpcd 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 @@ include $(CLEAR_VARS) 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) |