aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2016-07-19 23:51:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-19 23:51:13 +0000
commitecea2848419db0da42050d331e15ec7bc03e73c1 (patch)
tree3611ca42138d755ca4e33db2dde656154ae73bb5
parentfeb8521d93787a9871d5460e664b0e2d48fc339f (diff)
parentf9d953a9f5fa0fa0df0b9d79ab5962ed39e840a3 (diff)
downloadcurl-ecea2848419db0da42050d331e15ec7bc03e73c1.tar.gz
Merge \\"Disable warnings triggered in Clang r271374\\" am: 88fae75654
am: f9d953a9f5 Change-Id: Ica087b46cf415f835dbb7d82d08339746a26162c
-rw-r--r--Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 6e61c1d98..22fd0a625 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,9 @@ curl_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline \
-Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement \
-Wno-system-headers -DHAVE_CONFIG_H -DOS='$(version_string)' -Werror
+# Bug: http://b/29823425 Disable -Wvarargs for Clang update to r271374
+curl_CFLAGS += -Wno-varargs
+
curl_includes := \
$(LOCAL_PATH)/include/ \
$(LOCAL_PATH)/lib