From 99326e3ea5de3113a0c748342cf87a5b0f34c790 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Thu, 21 Nov 2013 13:22:26 -0500
Subject: [PATCH] remove java loading of lib_codec
---
jni/Android.mk | 7 +------
src/org/sflphone/service/SipService.java | 8 --------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/jni/Android.mk b/jni/Android.mk
index 7d875f0da..50b779215 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -91,6 +91,7 @@ LOCAL_SRC_FILES := \
$(LOCAL_SRC_PATH)/im/instant_messaging.cpp \
$(LOCAL_SRC_PATH)/sip/sdp.cpp \
$(LOCAL_SRC_PATH)/sip/sipaccount.cpp \
+ $(LOCAL_CODECS_PATH)/audiocodec.cpp \
$(LOCAL_SRC_PATH)/sip/sipcall.cpp \
$(LOCAL_SRC_PATH)/sip/sipvoiplink.cpp \
$(LOCAL_SRC_PATH)/sip/siptransport.cpp \
@@ -187,7 +188,6 @@ LOCAL_STATIC_LIBRARIES += libpjsua-$(TARGET_NAME) \
libpjnath-$(TARGET_NAME) \
libpjlib-util-$(TARGET_NAME) \
libpj-$(TARGET_NAME) \
- libspeex \
libssl \
libsamplerate \
libcrypto
@@ -197,11 +197,6 @@ LOCAL_STATIC_LIBRARIES += libpjsua-$(TARGET_NAME) \
LOCAL_SHARED_LIBRARIES += libccrtp1 \
libexpat_shared \
libpcre \
- libsamplerate \
- libcodec_ulaw \
- libcodec_alaw \
- libcodec_g722 \
- libcodec_opus \
libspeexresampler \
libyaml \
libsndfile
diff --git a/src/org/sflphone/service/SipService.java b/src/org/sflphone/service/SipService.java
index c9bb126aa..0ff4350ed 100644
--- a/src/org/sflphone/service/SipService.java
+++ b/src/org/sflphone/service/SipService.java
@@ -235,14 +235,6 @@ public class SipService extends Service {
System.loadLibrary("ccrtp1");
System.loadLibrary("pcre");
System.loadLibrary("samplerate");
- System.loadLibrary("codec_ulaw");
- System.loadLibrary("codec_alaw");
- System.loadLibrary("codec_g722");
- System.loadLibrary("codec_opus");
- System.loadLibrary("codec_gsm");
- System.loadLibrary("codec_speex_nb");
- System.loadLibrary("codec_speex_ub");
- System.loadLibrary("codec_speex_wb");
System.loadLibrary("speexresampler");
System.loadLibrary("sflphone");
isPjSipStackStarted = true;
--
GitLab