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

Commit 5b7d5244 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in packages/apps/Gallery2" 

am: 24309021

Change-Id: Iee490c18f1d60f20ba19e304614c01fe481ff0d8
parents ea2a43b6 24309021

jni/Android.mk

+11 −4
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



Gallery2_jni_cflags := \

    -Wall -Wextra -Werror \

    -Wno-error=constant-conversion \

    -Wno-unused-parameter \



# to fix implicit conversion from 'int' to 'char', (255 to -1, 128 to -128)



include $(CLEAR_VARS)



LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -Wno-unused-parameter

LOCAL_CFLAGS += -Wall -Wextra

LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES

LOCAL_CFLAGS += $(Gallery2_jni_cflags)



LOCAL_SRC_FILES := jni_egl_fence.cpp
@@ -45,8 +52,8 @@ LOCAL_SRC_FILES := filters/gradient.c \ 
                   filters/tinyplanet.cc \

                   filters/kmeans.cc



LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops -Wno-unused-parameter

LOCAL_CFLAGS += -Wall -Wextra

LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops

LOCAL_CFLAGS += $(Gallery2_jni_cflags)

LOCAL_LDLIBS := -llog -ljnigraphics

LOCAL_ARM_MODE := arm

jni_jpegstream/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ LOCAL_SDK_VERSION := 17 
LOCAL_ARM_MODE := arm



LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops

LOCAL_CFLAGS += -Wall -Wextra

LOCAL_CFLAGS += -Wall -Wextra -Werror

LOCAL_LDLIBS := -llog



LOCAL_CPP_EXTENSION := .cpp