am db99a10b: Fix NPE in PhotoPage

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

diff --git a/jni/Android.mk b/jni/Android.mk
index a4fb844..db31bfd 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -6,10 +6,7 @@ LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
 
 LOCAL_SRC_FILES := jni_egl_fence.cpp
 
-ifeq ($(TARGET_ARCH), arm)
-        LOCAL_NDK_VERSION := 5
-        LOCAL_SDK_VERSION := 9
-endif
+LOCAL_SDK_VERSION := 9
 
 LOCAL_LDFLAGS :=  -llog -lEGL
 
@@ -17,4 +14,36 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := libjni_eglfence
 
+
+include $(BUILD_SHARED_LIBRARY)
+
+# Filtershow
+
+include $(CLEAR_VARS)
+
+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 \
+                   filters/saturated.c \
+                   filters/exposure.c \
+                   filters/contrast.c \
+                   filters/hue.c \
+                   filters/shadows.c \
+                   filters/hsv.c \
+                   filters/vibrance.c \
+                   filters/geometry.c \
+                   filters/vignette.c \
+                   filters/redEyeMath.c \
+                   filters/fx.c \
+                   filters/wbalance.c \
+                   filters/redeye.c \
+                   filters/bwfilter.c \
+                   filters/tinyplanet.cc
+
+LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
+LOCAL_ARM_MODE := arm
+
 include $(BUILD_SHARED_LIBRARY)