commit fb3125e4edc6aa1bfc1f7afc189e9af41a9b1c32
author Chih-Hung Hsieh <chh@google.com> Thu Nov 02 10:24:36 2017 -0700
committer LuK1337 <priv.luk@gmail.com> Mon Oct 21 21:40:56 2019 +0200
tree 7b7389cc009104945d35db7a2bf83610ea363b2b
parent 8ae4143e9555685b19b695ca4c7d1b28825a01d4

Use -Werror in packages/apps/Gallery2

* Keep constant-conversion warnings to fix later.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ib93e954e025fd2f0202960df20583b50b97fce7f

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 1a45a90..28c6d78 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 @@
                    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
 

jni_jpegstream/Android.mk

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 40b9bd5..76946f7 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -18,6 +18,7 @@
 LOCAL_ARM_MODE := arm
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += -Wall -Wextra -Werror
 LOCAL_CPPFLAGS += $(JNI_CFLAGS)
 LOCAL_LDLIBS := -llog