Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
#ifndef GraphicsJNI_DEFINED
|
#ifndef GraphicsJNI_DEFINED
|
||||||
#define GraphicsJNI_DEFINED
|
#define GraphicsJNI_DEFINED
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||||
#include "SkBitmap.h"
|
#include "SkBitmap.h"
|
||||||
#include "SkDevice.h"
|
#include "SkDevice.h"
|
||||||
#include "SkPixelRef.h"
|
#include "SkPixelRef.h"
|
||||||
@@ -8,6 +10,8 @@
|
|||||||
#include "SkPoint.h"
|
#include "SkPoint.h"
|
||||||
#include "SkRect.h"
|
#include "SkRect.h"
|
||||||
#include "SkImageDecoder.h"
|
#include "SkImageDecoder.h"
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
|
||||||
#include <jni.h>
|
#include <jni.h>
|
||||||
|
|
||||||
class SkBitmapRegionDecoder;
|
class SkBitmapRegionDecoder;
|
||||||
|
|||||||
Reference in New Issue
Block a user