DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master

[android-x86/packages-apps-Gallery2.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 0b8480e..c08d7be 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,19 +1,29 @@
 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
 
 LOCAL_SDK_VERSION := 9
 
-LOCAL_LDFLAGS :=  -llog -lEGL
-
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := libjni_eglfence
 
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_LDLIBS := -llog -lEGL
+
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -22,9 +32,9 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_CPP_EXTENSION := .cc
-LOCAL_LDFLAGS  := -llog -ljnigraphics
 LOCAL_SDK_VERSION := 9
 LOCAL_MODULE    := libjni_filtershow_filters
+LOCAL_PRODUCT_MODULE := true
 LOCAL_SRC_FILES := filters/gradient.c \
                    filters/saturated.c \
                    filters/exposure.c \
@@ -45,7 +55,9 @@ 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
 
 include $(BUILD_SHARED_LIBRARY)