diff options
| author | Stephen Hines <srhines@google.com> | 2015-04-01 22:09:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 22:09:03 +0000 |
| commit | 55ae50dc1d6d399586fa13cf176a21e755bfb3d5 (patch) | |
| tree | 55a9c41bb6cccb9aab19ab988c47e262a86913be /core/clang | |
| parent | ead02d1129347fe0b570a64cb2192cb9b2bed401 (diff) | |
| parent | 95212b900b7a9a205d6f8b79dc3fcc07576c18cd (diff) | |
| download | build-55ae50dc1d6d399586fa13cf176a21e755bfb3d5.zip build-55ae50dc1d6d399586fa13cf176a21e755bfb3d5.tar.gz build-55ae50dc1d6d399586fa13cf176a21e755bfb3d5.tar.bz2 | |
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.
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/config.mk | 5 |
1 files changed, 5 insertions, 0 deletions
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 += \ 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 += \ |