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

Commit c4b46d47 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

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

* commit '71889039':
  Frameworks/base: Wall Werror in native/graphics
parents 469a1a53 71889039

native/graphics/jni/Android.mk

+7 −5
Original line number Original line Diff line number Diff line
@@ -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)

native/graphics/jni/bitmap.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -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) {