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

Commit 73a177a2 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge \\"Use a NDK-compatible libjpeg\\" am: 0f763c5d 

am: 2da3ecb5

Change-Id: I99a5e3a21af2ad1de6e919f2bddb7cdea10560a7
parents 10900ad1 2da3ecb5

jni_jpegstream/Android.mk

+2 −4
Original line number Diff line number Diff line
@@ -9,16 +9,14 @@ LOCAL_MODULE := libjni_jpegstream 
LOCAL_NDK_STL_VARIANT := stlport_static



LOCAL_C_INCLUDES := $(LOCAL_PATH) \

                    $(LOCAL_PATH)/src \

                    external/jpeg

                    $(LOCAL_PATH)/src



LOCAL_SHARED_LIBRARIES := libjpeg

LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk



LOCAL_SDK_VERSION   := 9

LOCAL_ARM_MODE := arm



LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops

LOCAL_CPPFLAGS += $(JNI_CFLAGS)

LOCAL_LDLIBS := -llog



LOCAL_CPP_EXTENSION := .cpp