Skip to content
Snippets Groups Projects
Commit 449ca846 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

Link to static dependencies

Refs: #52673
parent 9abb7c99
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,7 @@ $(LIBSFLPHONEJNI): $(JNI_SOURCES) $(LIBSFLPHONEJNI_H) ...@@ -47,7 +47,7 @@ $(LIBSFLPHONEJNI): $(JNI_SOURCES) $(LIBSFLPHONEJNI_H)
@echo @echo
@echo "=== Building libsflphonejni ===" @echo "=== Building libsflphonejni ==="
@echo @echo
$(VERBOSE)if [ -z "$(SFLPHONE_SRC_DIR)" ] ; then SFLPHONE_SRC_DIR=./vlc; fi ; \ $(VERBOSE)if [ -z "$(SFLPHONE_SRC_DIR)" ] ; then SFLPHONE_SRC_DIR=./sflphone; fi ; \
if [ -z "$(SFLPHONE_CONTRIB)" ] ; then SFLPHONE_CONTRIB="$$SFLPHONE_SRC_DIR/contrib/$(TARGET_TUPLE)"; fi ; \ if [ -z "$(SFLPHONE_CONTRIB)" ] ; then SFLPHONE_CONTRIB="$$SFLPHONE_SRC_DIR/contrib/$(TARGET_TUPLE)"; fi ; \
if [ `echo "$(SFLPHONE_BUILD_DIR)" | head -c 1` != "/" ] ; then \ if [ `echo "$(SFLPHONE_BUILD_DIR)" | head -c 1` != "/" ] ; then \
SFLPHONE_BUILD_DIR="../$(SFLPHONE_BUILD_DIR)"; \ SFLPHONE_BUILD_DIR="../$(SFLPHONE_BUILD_DIR)"; \
......
...@@ -33,13 +33,17 @@ include $(CLEAR_VARS) ...@@ -33,13 +33,17 @@ include $(CLEAR_VARS)
LOCAL_CODECS_PATH = $(SFLPHONE_SRC)/daemon/src/audio/codecs LOCAL_CODECS_PATH = $(SFLPHONE_SRC)/daemon/src/audio/codecs
LOCAL_SRC_PATH = $(SFLPHONE_SRC)/daemon/src LOCAL_SRC_PATH = $(SFLPHONE_SRC)/daemon/src
include $(call all-subdir-makefiles) $(warning $(SFLPHONE_CONTRIB))
include $(CLEAR_VARS) include $(CLEAR_VARS)
VERSION="1.1.0" VERSION="1.1.0"
MY_PREFIX=/sdcard MY_PREFIX=/sdcard
MY_DATADIR=/data/data MY_DATADIR=/data/data
ARCH=$(ANDROID_ABI)
CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++$(CXXSTL)/libs/$(ARCH)/libgnustl_static.a
LOCAL_CPPFLAGS += -frtti LOCAL_CPPFLAGS += -frtti
LOCAL_CPPFLAGS += -fexceptions LOCAL_CPPFLAGS += -fexceptions
...@@ -70,31 +74,32 @@ LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ ...@@ -70,31 +74,32 @@ LOCAL_CPPFLAGS += $(NETWORKMANAGER) \
LOCAL_LDLIBS += -lz \ LOCAL_LDLIBS += -lz \
-llog \ -llog \
-lOpenSLES \ -lOpenSLES \
-L$(SFLPHONE_CONTRIB)/lib \
# LOCAL_STATIC_LIBRARIES (NDK documentation) -L$(SFLPHONE_SRC)/daemon/src/.libs \
# The list of static libraries modules (built with BUILD_STATIC_LIBRARY) -lsflphone \
# that should be linked to this module. -lavcodec \
LOCAL_STATIC_LIBRARIES += pjsip \ -lexpat -lhogweed -lpj-arm-unknown-linux-androideabi \
pjnath \ -lpjsip-simple-arm-unknown-linux-androideabi \
pjmedia \ -lpjlib-util-arm-unknown-linux-androideabi \
pjlib \ -lpjsip-ua-arm-unknown-linux-androideabi \
pjlib-util \ -lspeexdsp -lvorbisfile \
libssl \ -lavdevice -lFLAC \
libpcre \ -liax -lsrtp-arm-unknown-linux-androideabi \
libccgnu2 \ -lvpx -lavfilter -lgcrypt -lnettle \
libsamplerate \ -lpjmedia-arm-unknown-linux-androideabi \
libspeex \ -lpjsua2-arm-unknown-linux-androideabi \
libcrypto \ -lswscale -lx264 -lavformat -lgmp \
libzrtpcpp \ -logg -lpjmedia-audiodev-arm-unknown-linux-androideabi \
libsndfile \ -lpjsua-arm-unknown-linux-androideabi -lucommon -lyaml \
libccrtp1 \ -lavresample -lgnutls -lopus \
libexpat \ -lpjmedia-codec-arm-unknown-linux-androideabi \
libspeexresampler \ -lresample-arm-unknown-linux-androideabi -lusecure \
libyaml \ -lavutil -lgnutls-xssl -lpcre -lpjmedia-videodev-arm-unknown-linux-androideabi \
libiax2 -lsamplerate -luuid -lccrtp -lgpg-error -lpcrecpp \
-lpjnath-arm-unknown-linux-androideabi -lsndfile -lvorbis \
-lcommoncpp -lgsm -lpcreposix -lpjsip-arm-unknown-linux-androideabi \
-lspeex -lvorbisenc \
$(CPP_STATIC)
LOCAL_SHARE_LIBRARIES := libsflphone
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
%header %{ %header %{
#include "sflphone.h" #include "sflphone.h"
%}
class ManagerImpl { class ManagerImpl {
public: public:
/** /**
...@@ -57,3 +54,6 @@ public: ...@@ -57,3 +54,6 @@ public:
void sflph_poll_events(void); void sflph_poll_events(void);
}; };
%}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment