am 95212b90: am 31f35975: am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
* commit '95212b900b7a9a205d6f8b79dc3fcc07576c18cd':
Don't warn on definition of possibly reserved identifiers.
diff --git a/core/clang/config.mk b/core/clang/config.mk
index a39095e..ff2c757 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -43,6 +43,11 @@
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 += \