diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-11 18:42:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:42:23 +0000 |
| commit | a9c4376daac3b9deda0c617b6df393e741885f37 (patch) | |
| tree | 7a67bb69073ca6f20c42c6a056ff5392faf59ce7 | |
| parent | 083f1b5d9ca50f1ca2decbec7f1ed5f35011b903 (diff) | |
| parent | 7a6bd46dc1a67e79afe1045877cf0115d43a6be8 (diff) | |
| download | android_packages_apps_Gallery2-a9c4376daac3b9deda0c617b6df393e741885f37.tar.gz android_packages_apps_Gallery2-a9c4376daac3b9deda0c617b6df393e741885f37.tar.bz2 android_packages_apps_Gallery2-a9c4376daac3b9deda0c617b6df393e741885f37.zip | |
am 7a6bd46d: Merge "A couple of fixes"
* commit '7a6bd46dc1a67e79afe1045877cf0115d43a6be8':
A couple of fixes
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/filters/hsv.c | 1 | ||||
| -rw-r--r-- | jni_jpegstream/Android.mk | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 0b8480e56..37382e495 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 aabd053fe..966b05abb 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){ diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk index 2a09fb5d9..96cc7ec65 100644 --- a/jni_jpegstream/Android.mk +++ b/jni_jpegstream/Android.mk @@ -12,9 +12,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(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 |