Merge "Don't warn on definition of possibly reserved identifiers."

2015-04-01 18:50:28 +00:00
parent 2d47488e67 f68002187a
commit 9a98c47c64
1 changed files with 5 additions and 0 deletions
--- 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 += \