diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-18 22:39:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-18 22:39:30 +0000 |
| commit | 8462913d0c19973901a861749b4abbaacdf4b477 (patch) | |
| tree | cea52a2030a2d3910eb42a6e4746eccd5e3ea768 | |
| parent | 56090472230dc56acc203589f3efcb65579fb54d (diff) | |
| parent | 26109fd328aec626dde78366d961c34600fc7b15 (diff) | |
| download | frameworks_base-8462913d0c19973901a861749b4abbaacdf4b477.zip frameworks_base-8462913d0c19973901a861749b4abbaacdf4b477.tar.gz frameworks_base-8462913d0c19973901a861749b4abbaacdf4b477.tar.bz2 | |
Merge "Frameworks/base: Ignore unknown pragmas in 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) |