Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ce23ecff: Merge "Frameworks/base: Wall Werror in native/graphics"

Browse Source 
* commit 'ce23ecffea9ec4ebe97d91a59e1997aaa77562c9':
  Frameworks/base: Wall Werror in native/graphics
This commit is contained in:
Andreas Gampe
2014-11-11 02:16:13 +00:00
committed by Android Git Automerger
parent 37fcecde6d ce23ecffea
commit 7188903963
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
native/graphics/jni/Android.mk
View File

@@ -28,5 +28,7 @@ LOCAL_C_INCLUDES += \
LOCAL_MODULE:= libjnigraphics LOCAL_MODULE:= libjnigraphics
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
native/graphics/jni/bitmap.cpp
View File

@@ -15,7 +15,11 @@
*/ */
#include <android/bitmap.h> #include <android/bitmap.h>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <GraphicsJNI.h> #include <GraphicsJNI.h>
#pragma GCC diagnostic pop
int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,
AndroidBitmapInfo* info) { AndroidBitmapInfo* info) {