diff options
| author | 2014-11-22 00:24:38 +0000 | |
|---|---|---|
| committer | 2014-11-22 00:24:39 +0000 | |
| commit | fc4a7538a65449428e9d321deb6a413e19461c6c (patch) | |
| tree | 2d7f64648c42a8992320f8ddfe5d428144ef518b | |
| parent | ad9387974b02528ff0366134a3740d66fb0b1cd5 (diff) | |
| parent | 9ebffb40d80cb6eb1c3bcd51007a3b68f32e4ba7 (diff) | |
Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""
| -rw-r--r-- | core/jni/android/graphics/GraphicsJNI.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h index 45b31c0b639e..0ce6e493a128 100644 --- a/core/jni/android/graphics/GraphicsJNI.h +++ b/core/jni/android/graphics/GraphicsJNI.h @@ -1,8 +1,6 @@ #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; |