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

Commit 745eb589 authored by Ying Wang's avatar Ying Wang
Browse files

Build against the NDK libraries. 

That way you don't have dependency on the platform libraries, which in
turn depends on things like libcompiler_rt-extras, which isn't exposed
to apps_only build.

Bug: 16398512
Change-Id: Ie7cf54c97c57b13e82c1891970eb3731a68ae075
parent c0a5cca7

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ LOCAL_MULTILIB := 32 


include $(BUILD_PACKAGE)



include $(call all-makefiles-under, jni)



ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)



# Use the following include to make gallery test apk

jni/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ LOCAL_SRC_FILES := jni_egl_fence.cpp 


LOCAL_SDK_VERSION := 9



LOCAL_SHARED_LIBRARIES := liblog libEGL



LOCAL_MODULE_TAGS := optional



LOCAL_MODULE := libjni_eglfence



LOCAL_LDLIBS := -llog -lEGL





include $(BUILD_SHARED_LIBRARY)
@@ -22,7 +22,6 @@ include $(BUILD_SHARED_LIBRARY) 
include $(CLEAR_VARS)



LOCAL_CPP_EXTENSION := .cc

LOCAL_SHARED_LIBRARIES := liblog libjnigraphics

LOCAL_SDK_VERSION := 9

LOCAL_MODULE    := libjni_filtershow_filters

LOCAL_SRC_FILES := filters/gradient.c \
@@ -46,6 +45,7 @@ LOCAL_SRC_FILES := filters/gradient.c \ 
                   filters/kmeans.cc



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

LOCAL_LDLIBS := -llog -ljnigraphics

LOCAL_ARM_MODE := arm



include $(BUILD_SHARED_LIBRARY)

jni_jpegstream/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ 
                    $(LOCAL_PATH)/src \

                    external/jpeg



LOCAL_SHARED_LIBRARIES := libjpeg liblog

LOCAL_SHARED_LIBRARIES := libjpeg



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

LOCAL_SRC_FILES     := \