diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-11 05:02:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-11 05:02:32 +0000 |
| commit | 71f83672f297b116988defbe989869e5744cda5e (patch) | |
| tree | df54a2f290a107f45058e5115d8d405fd39922f7 /core/jni/android | |
| parent | c6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b (diff) | |
| parent | ba823cee8bafff98640408a777fe105a72fcea0d (diff) | |
| download | frameworks_base-71f83672f297b116988defbe989869e5744cda5e.zip frameworks_base-71f83672f297b116988defbe989869e5744cda5e.tar.gz frameworks_base-71f83672f297b116988defbe989869e5744cda5e.tar.bz2 | |
Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"
Diffstat (limited to 'core/jni/android')
| -rw-r--r-- | core/jni/android/graphics/GraphicsJNI.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h index dcc97e5..e2b31cb 100644 --- a/core/jni/android/graphics/GraphicsJNI.h +++ b/core/jni/android/graphics/GraphicsJNI.h @@ -1,6 +1,8 @@ #ifndef GraphicsJNI_DEFINED #define GraphicsJNI_DEFINED +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" #include "SkBitmap.h" #include "SkDevice.h" #include "SkPixelRef.h" @@ -8,6 +10,8 @@ #include "SkPoint.h" #include "SkRect.h" #include "SkImageDecoder.h" +#pragma GCC diagnostic pop + #include <jni.h> class SkBitmapRegionDecoder; |