summaryrefslogtreecommitdiffstats
path: root/core/jni/android
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-10 21:01:06 -0800
committerAndreas Gampe <agampe@google.com>2014-11-10 21:01:06 -0800
commitba823cee8bafff98640408a777fe105a72fcea0d (patch)
treedf54a2f290a107f45058e5115d8d405fd39922f7 /core/jni/android
parentc6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b (diff)
downloadframeworks_base-ba823cee8bafff98640408a777fe105a72fcea0d.zip
frameworks_base-ba823cee8bafff98640408a777fe105a72fcea0d.tar.gz
frameworks_base-ba823cee8bafff98640408a777fe105a72fcea0d.tar.bz2
Frameworks/base: Mask Skia warning in GraphicsJNI
Do not allow unused-parameter warnings from Skia includes. Change-Id: Icc765cb0eaf10cd566a64892fbfe7380143ccb42
Diffstat (limited to 'core/jni/android')
-rw-r--r--core/jni/android/graphics/GraphicsJNI.h4
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;