am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."

* commit '9a98c47c64446e0c46f1d24f3d6526d177b62e14':
  Don't warn on definition of possibly reserved identifiers.
This commit is contained in:
Stephen Hines 2015-04-01 18:59:07 +00:00 committed by Android Git Automerger
commit 31f3597517
1 changed files with 5 additions and 0 deletions

View File

@ -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 += \