diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-18 22:48:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 22:48:42 +0000 |
| commit | 01dbe7397642836107c2189e36e7387e354081fd (patch) | |
| tree | 53e0d42c07607ec5942ddc1b17fe9b65f79035aa /core/jni | |
| parent | 7f8040a80472b86c358f4b28ca7ec938d7fbed00 (diff) | |
| parent | 8462913d0c19973901a861749b4abbaacdf4b477 (diff) | |
| download | frameworks_base-01dbe7397642836107c2189e36e7387e354081fd.zip frameworks_base-01dbe7397642836107c2189e36e7387e354081fd.tar.gz frameworks_base-01dbe7397642836107c2189e36e7387e354081fd.tar.bz2 | |
am 8462913d: Merge "Frameworks/base: Ignore unknown pragmas in core/jni"
* commit '8462913d0c19973901a861749b4abbaacdf4b477':
Frameworks/base: Ignore unknown pragmas in core/jni
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index adeffad..d53a5b8 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -261,7 +261,9 @@ LOCAL_C_INCLUDES += bionic/libc/private LOCAL_MODULE:= libandroid_runtime -LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code +# -Wno-unknown-pragmas: necessary for Clang as the GL bindings need to turn +# off a GCC warning that Clang doesn't know. +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -Wno-unknown-pragmas include $(BUILD_SHARED_LIBRARY) |