Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29d1b12d authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Android Git Automerger
Browse files

am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""

* commit '05f7c39e':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
parents f2d270a9 05f7c39e
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
#ifndef _ANDROID_GRAPHICS_GRAPHICS_JNI_H_
#define _ANDROID_GRAPHICS_GRAPHICS_JNI_H_

#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;