Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 566e0bd5 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 6b0afa7e: am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes" 

* commit '6b0afa7e':
  A couple of fixes
parents f49076ac 6b0afa7e

jni/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 \

jni/filters/hsv.c

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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