diff options
| author | Stephen Hines <srhines@google.com> | 2015-04-01 18:50:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-01 18:50:29 +0000 |
| commit | 9a98c47c64446e0c46f1d24f3d6526d177b62e14 (patch) | |
| tree | 1e490afa6e913ba1c2c2e1026a608e6df411589a /core/clang | |
| parent | 2d47488e675d0eb839ae6a7f9544cc64c50c68d2 (diff) | |
| parent | f68002187a553de0d22ec97168e6b1c7148f109e (diff) | |
| download | build-9a98c47c64446e0c46f1d24f3d6526d177b62e14.zip build-9a98c47c64446e0c46f1d24f3d6526d177b62e14.tar.gz build-9a98c47c64446e0c46f1d24f3d6526d177b62e14.tar.bz2 | |
Merge "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 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 += \ |