aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-09 23:22:18 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-09 23:22:18 +0000
commit5b66af5477511ee2f0d68f7267dd4b62c77ff5d9 (patch)
tree16931d8f2574cc22d90136e202f00e80fe608aa7
parent45f6da643b723e29aa94147adc2f143588e1d919 (diff)
parent555fad11b317c3e35fbaf2d7e983d3e34172bd3e (diff)
downloadandroid_external_dhcpcd-5b66af5477511ee2f0d68f7267dd4b62c77ff5d9.tar.gz
android_external_dhcpcd-5b66af5477511ee2f0d68f7267dd4b62c77ff5d9.tar.bz2
android_external_dhcpcd-5b66af5477511ee2f0d68f7267dd4b62c77ff5d9.zip
Merge "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)