aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-02-20 03:09:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-20 03:09:14 +0000
commit39d72dcdd162af365717956acd4280ead441a70a (patch)
tree9d78c94e67279560475bb55ce8db3b0b2e255656
parent3f6d58e270c01f53cd838ad9b79d99a0c6bdd258 (diff)
parent22bd6386e28c9bd3fd15d896bc224cd989dd871b (diff)
downloadandroid_external_dhcpcd-39d72dcdd162af365717956acd4280ead441a70a.tar.gz
android_external_dhcpcd-39d72dcdd162af365717956acd4280ead441a70a.tar.bz2
android_external_dhcpcd-39d72dcdd162af365717956acd4280ead441a70a.zip
am 22bd6386: Fix clang build.
* commit '22bd6386e28c9bd3fd15d896bc224cd989dd871b': Fix clang build.
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 1ee3230..108451c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,7 @@ LOCAL_SRC_FILES := arp.c bind.c common.c control.c dhcp.c dhcpcd.c duid.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_SHARED_LIBRARIES := libc libcutils libnetutils
LOCAL_MODULE = dhcpcd
include $(BUILD_EXECUTABLE)
@@ -57,5 +58,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_MODULE_TAGS := eng tests
include $(BUILD_NATIVE_TEST)