commit a2818d95445cde63d679e5678803417c475fc719
author Kévin PETIT <kevin.petit@arm.com> Fri Feb 07 16:43:56 2014 +0000
committer Kévin PETIT <kevin.petit@arm.com> Wed Mar 05 12:47:36 2014 +0000
tree c525fbd082aff9936b0e43b5956a9eb9a763624b
parent e9c89c814c97a74456ad1bf8d4c32a983663924c

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>

jni/Android.mk

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_SDK_VERSION := 9
 
-LOCAL_LDFLAGS :=  -llog -lEGL
+LOCAL_SHARED_LIBRARIES := liblog libEGL
 
 LOCAL_MODULE_TAGS := optional
 
@@ -22,7 +22,7 @@
 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 \

jni/filters/hsv.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){

jni_jpegstream/Android.mk

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 2a09fb5..96cc7ec 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -12,9 +12,8 @@
                     $(LOCAL_PATH)/src \
                     external/jpeg
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_SHARED_LIBRARIES := libjpeg liblog
 
-LOCAL_LDFLAGS        := -llog
 LOCAL_SDK_VERSION   := 9
 LOCAL_ARM_MODE := arm