aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-02-20 03:13:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-20 03:13:57 +0000
commitd2102144818c8d5f0c9069b0b8a1546cdb867aed (patch)
tree98f92d836f4bc1dcee876e9a3b1c4869be1b5279
parenta1d83351a492eb71c561b5348d2018678d0c7c23 (diff)
parent39d72dcdd162af365717956acd4280ead441a70a (diff)
downloadandroid_external_dhcpcd-d2102144818c8d5f0c9069b0b8a1546cdb867aed.tar.gz
android_external_dhcpcd-d2102144818c8d5f0c9069b0b8a1546cdb867aed.tar.bz2
android_external_dhcpcd-d2102144818c8d5f0c9069b0b8a1546cdb867aed.zip
am 39d72dcd: am 22bd6386: Fix clang build.
* commit '39d72dcdd162af365717956acd4280ead441a70a': 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)