summaryrefslogtreecommitdiffstats
path: root/core/clang
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2015-04-01 19:09:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 19:09:58 +0000
commit95212b900b7a9a205d6f8b79dc3fcc07576c18cd (patch)
tree1ee80cc981bf5baec529e47df7bd9367f7126c5d /core/clang
parent9160c60f136bafc9b8c07252e5814950eff33a20 (diff)
parent31f35975178e00c1178433bbbdefa0e27bee9750 (diff)
downloadbuild-95212b900b7a9a205d6f8b79dc3fcc07576c18cd.zip
build-95212b900b7a9a205d6f8b79dc3fcc07576c18cd.tar.gz
build-95212b900b7a9a205d6f8b79dc3fcc07576c18cd.tar.bz2
am 31f35975: am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
* commit '31f35975178e00c1178433bbbdefa0e27bee9750': Don't warn on definition of possibly reserved identifiers.
Diffstat (limited to 'core/clang')
-rw-r--r--core/clang/config.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk
index 72a880f..60889e7 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -43,6 +43,11 @@ CLANG_CONFIG_EXTRA_CFLAGS += \
CLANG_CONFIG_EXTRA_CFLAGS += \
-Werror=int-conversion
+# Disable overly aggressive warning for macros defined with a leading underscore
+# This happens in AndroidConfig.h, which is included nearly everywhere.
+CLANG_CONFIG_EXTRA_CFLAGS += \
+ -Wno-reserved-id-macro
+
# Workaround for ccache with clang.
# See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.
CLANG_CONFIG_EXTRA_CFLAGS += \