Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""
This commit is contained in:
@@ -1,8 +1,6 @@
|
|||||||
#ifndef _ANDROID_GRAPHICS_GRAPHICS_JNI_H_
|
#ifndef _ANDROID_GRAPHICS_GRAPHICS_JNI_H_
|
||||||
#define _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 "SkBitmap.h"
|
||||||
#include "SkDevice.h"
|
#include "SkDevice.h"
|
||||||
#include "SkPixelRef.h"
|
#include "SkPixelRef.h"
|
||||||
@@ -10,8 +8,6 @@
|
|||||||
#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