merge in jb-mr2-release history after reset to master

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

diff --git a/jni/Android.mk b/jni/Android.mk
index db31bfd..1843c77 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -25,23 +25,25 @@ LOCAL_CPP_EXTENSION := .cc
 LOCAL_LDFLAGS  := -llog -ljnigraphics
 LOCAL_SDK_VERSION := 9
 LOCAL_MODULE    := libjni_filtershow_filters
-LOCAL_SRC_FILES := filters/bw.c \
-                   filters/gradient.c \
+LOCAL_SRC_FILES := filters/gradient.c \
                    filters/saturated.c \
                    filters/exposure.c \
+                   filters/edge.c \
                    filters/contrast.c \
                    filters/hue.c \
                    filters/shadows.c \
                    filters/hsv.c \
                    filters/vibrance.c \
                    filters/geometry.c \
+                   filters/negative.c \
                    filters/vignette.c \
                    filters/redEyeMath.c \
                    filters/fx.c \
                    filters/wbalance.c \
                    filters/redeye.c \
                    filters/bwfilter.c \
-                   filters/tinyplanet.cc
+                   filters/tinyplanet.cc \
+                   filters/kmeans.cc
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
 LOCAL_ARM_MODE := arm