summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
authorKévin PETIT <kevin.petit@arm.com>2014-02-07 16:43:56 (GMT)
committerKévin PETIT <kevin.petit@arm.com>2014-03-05 12:47:36 (GMT)
commita2818d95445cde63d679e5678803417c475fc719 (patch)
treec525fbd082aff9936b0e43b5956a9eb9a763624b /jni
parente9c89c814c97a74456ad1bf8d4c32a983663924c (diff)
downloadandroid_packages_apps_Gallery2-a2818d95445cde63d679e5678803417c475fc719.zip
android_packages_apps_Gallery2-a2818d95445cde63d679e5678803417c475fc719.tar.gz
android_packages_apps_Gallery2-a2818d95445cde63d679e5678803417c475fc719.tar.bz2
A couple of fixes
- using LDFLAGS doesn't pull the required dependencies, move to using LOCAL_SHARED_LIBRARIES - eliminate 'implicit declaration' warnings Change-Id: I57f6feca6bfcf8b2e9d439462a33c9757cdde07d Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Diffstat (limited to 'jni')
-rw-r--r--jni/Android.mk4
-rw-r--r--jni/filters/hsv.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index 0b8480e..37382e4 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := jni_egl_fence.cpp
LOCAL_SDK_VERSION := 9
-LOCAL_LDFLAGS := -llog -lEGL
+LOCAL_SHARED_LIBRARIES := liblog libEGL
LOCAL_MODULE_TAGS := optional
@@ -22,7 +22,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := .cc
-LOCAL_LDFLAGS := -llog -ljnigraphics
+LOCAL_SHARED_LIBRARIES := liblog libjnigraphics
LOCAL_SDK_VERSION := 9
LOCAL_MODULE := libjni_filtershow_filters
LOCAL_SRC_FILES := filters/gradient.c \
diff --git a/jni/filters/hsv.c b/jni/filters/hsv.c
index aabd053..966b05a 100644
--- a/jni/filters/hsv.c
+++ b/jni/filters/hsv.c
@@ -15,6 +15,7 @@
*/
#include <math.h>
+#include <stdlib.h> /* For abs */
#include "filters.h"
double fastevalPoly(double *poly,int n, double x){