From 55a5116d9fa4da8328c869dcd2a4a9293d7f18c5 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Fri, 6 Dec 2013 15:25:20 -0500
Subject: [PATCH] jni: sflphone module updated
---
.gitignore | 3 +++
AndroidManifest.xml | 2 +-
jni/Android.mk | 5 +++--
jni/libsndfile/sources/src/sndfile.c | 4 ----
jni/sflphone | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2fcf896d2..06ab0310b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@ AndroidUnusedResources1.6.2.jar
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.jdt.ui.prefs
local.properties
+.externalToolBuilders/
+.settings/org.eclipse.ltk.core.refactoring.prefs
ant.properties
*.keystore
@@ -32,3 +34,4 @@ Callback.java
VectMap.java
jni/pjproject-android/build/cc-auto.mak
*.o
+tests/bin
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 35feb0aea..657ddba49 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,7 +37,7 @@ as that of the covered work.
<uses-sdk
android:minSdkVersion="14"
- android:targetSdkVersion="18" />
+ android:targetSdkVersion="19" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
diff --git a/jni/Android.mk b/jni/Android.mk
index a22d358db..d813a6b89 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,8 +1,8 @@
LOCAL_PATH:= $(call my-dir)
-LOCAL_CODECS_PATH =sflphone/daemon/src/audio/codecs
-LOCAL_SRC_PATH = sflphone/daemon/src
+LOCAL_CODECS_PATH = $(LOCAL_PATH)/sflphone/daemon/src/audio/codecs
+LOCAL_SRC_PATH = $(LOCAL_PATH)/sflphone/daemon/src
include $(CLEAR_VARS)
@@ -19,6 +19,7 @@ include $(LOCAL_PATH)/libsamplerate/Android.mk
include $(LOCAL_PATH)/libexpat/Android.mk
include $(LOCAL_PATH)/libopenssl/Android.mk
include $(LOCAL_PATH)/commoncpp2-android/Android.mk
+#include $(LOCAL_PATH)/libopensles/libopensles/Android.mk
#include $(LOCAL_PATH)/libzrtp/Android.mk
# FIXME
diff --git a/jni/libsndfile/sources/src/sndfile.c b/jni/libsndfile/sources/src/sndfile.c
index 1f373f9c9..716c6dec3 100644
--- a/jni/libsndfile/sources/src/sndfile.c
+++ b/jni/libsndfile/sources/src/sndfile.c
@@ -2565,22 +2565,18 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo)
sf_errno = error = 0 ;
sf_logbuffer [0] = 0 ;
-__android_log_print(3,"TAG","psf_open_file 1");
if (psf->error)
{ error = psf->error ;
goto error_exit ;
} ;
-__android_log_print(3,"TAG","psf_open_file 2");
if (psf->file.mode != SFM_READ && psf->file.mode != SFM_WRITE && psf->file.mode != SFM_RDWR)
{ error = SFE_BAD_OPEN_MODE ;
goto error_exit ;
} ;
-__android_log_print(3,"TAG","psf_open_file 3");
if (sfinfo == NULL)
{ error = SFE_BAD_SF_INFO_PTR ;
goto error_exit ;
} ;
-__android_log_print(3,"TAG","psf_open_file 4");
/* Zero out these fields. */
sfinfo->frames = 0 ;
sfinfo->sections = 0 ;
diff --git a/jni/sflphone b/jni/sflphone
index 12fc4b3a7..d5d906a34 160000
--- a/jni/sflphone
+++ b/jni/sflphone
@@ -1 +1 @@
-Subproject commit 12fc4b3a714006b5fce5edb6792a1628a30c3edf
+Subproject commit d5d906a34ed72557306b9694e86991b0c10ba027
--
GitLab