summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-21 18:54:15 +0000
committerChih-hung Hsieh <chh@google.com>2014-11-21 18:54:15 +0000
commit9ebffb40d80cb6eb1c3bcd51007a3b68f32e4ba7 (patch)
treea3b60384cabb48f694e3c68649dab19e302c4577
parentba823cee8bafff98640408a777fe105a72fcea0d (diff)
downloadframeworks_base-9ebffb40d80cb6eb1c3bcd51007a3b68f32e4ba7.zip
frameworks_base-9ebffb40d80cb6eb1c3bcd51007a3b68f32e4ba7.tar.gz
frameworks_base-9ebffb40d80cb6eb1c3bcd51007a3b68f32e4ba7.tar.bz2
Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
Should be unnecessary after c/115476. This reverts commit ba823cee8bafff98640408a777fe105a72fcea0d. Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
-rw-r--r--core/jni/android/graphics/GraphicsJNI.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h
index e2b31cb..dcc97e5 100644
--- a/core/jni/android/graphics/GraphicsJNI.h
+++ b/core/jni/android/graphics/GraphicsJNI.h
@@ -1,8 +1,6 @@
#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"
@@ -10,8 +8,6 @@
#include "SkPoint.h"
#include "SkRect.h"
#include "SkImageDecoder.h"
-#pragma GCC diagnostic pop
-
#include <jni.h>
class SkBitmapRegionDecoder;