Snap for 4434599 from 24ab40f70bb5d504c0c33bfe25ff43a67bbfd91a to pi-release

Change-Id: Iabf061b0dcfd75b22a9fceccfb54419764904e8e

diff --git a/jni/Android.mk b/jni/Android.mk
index 32c7163..55bb205 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,9 +1,16 @@
 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
 

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index f3a631d..cac2a7b 100644 (file)
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -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