diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-11 05:10:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-11 05:10:19 +0000 |
| commit | 8c48c68cc7801451d069819c4417a3a240a64294 (patch) | |
| tree | 723a6ca62ebb42e5be33433952597009b9f00644 /core/jni/android | |
| parent | 6ca82929b1253f95f08612f737baeee35a3849bd (diff) | |
| parent | 71f83672f297b116988defbe989869e5744cda5e (diff) | |
| download | frameworks_base-8c48c68cc7801451d069819c4417a3a240a64294.zip frameworks_base-8c48c68cc7801451d069819c4417a3a240a64294.tar.gz frameworks_base-8c48c68cc7801451d069819c4417a3a240a64294.tar.bz2 | |
am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"
* commit '71f83672f297b116988defbe989869e5744cda5e':
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; |