summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jni/Android.mk11
-rw-r--r--jni_jpegstream/Android.mk1
2 files changed, 11 insertions, 1 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index 1a45a90be..28c6d78b7 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,8 +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
+LOCAL_CFLAGS += $(Gallery2_jni_cflags)
LOCAL_SRC_FILES := jni_egl_fence.cpp
@@ -44,7 +52,8 @@ LOCAL_SRC_FILES := filters/gradient.c \
filters/tinyplanet.cc \
filters/kmeans.cc
-LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+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 40b9bd53d..76946f758 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -18,6 +18,7 @@ LOCAL_SDK_VERSION := 17
LOCAL_ARM_MODE := arm
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += -Wall -Wextra -Werror
LOCAL_CPPFLAGS += $(JNI_CFLAGS)
LOCAL_LDLIBS := -llog