From 4f518386d6a56a7c5ca56fa04f897ff38a4a43e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrienberaud@gmail.com>
Date: Thu, 18 Apr 2013 16:51:59 +1000
Subject: [PATCH] using __ANDROID__ instead of the ANDROID macro
---
jni/Application.mk | 66 +++++++++----------
jni/sflphone | 2 +-
make-swig.sh | 10 +++
.../service/ConfigurationManagerJNI.java | 26 +-------
4 files changed, 45 insertions(+), 59 deletions(-)
diff --git a/jni/Application.mk b/jni/Application.mk
index 8759e6865..fe48fa8ad 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,41 +1,41 @@
APP_OPTIM := debug
-#APP_MODULES := libccgnu2
-#APP_MODULES += libyaml
-#APP_MODULES += libsamplerate
-#APP_MODULES += libexpat_static
-#APP_MODULES += libexpat_shared
-#APP_MODULES += libccrtp1
-#APP_MODULES += libcutils-static
-#APP_MODULES += libcutils-shared
-#APP_MODULES += libdbus
-#APP_MODULES += libdbus-tools-common
-#APP_MODULES += dbus-daemon
-#APP_MODULES += dbus-monitor
-#APP_MODULES += dbus-send
-#APP_MODULES += libdbus
-#APP_MODULES += libdbus-tools-common
+APP_MODULES := libccgnu2
+APP_MODULES += libyaml
+APP_MODULES += libsamplerate
+APP_MODULES += libexpat_static
+APP_MODULES += libexpat_shared
+APP_MODULES += libccrtp1
+APP_MODULES += libcutils-static
+APP_MODULES += libcutils-shared
+APP_MODULES += libdbus
+APP_MODULES += libdbus-tools-common
+APP_MODULES += dbus-daemon
+APP_MODULES += dbus-monitor
+APP_MODULES += dbus-send
+APP_MODULES += libdbus
+APP_MODULES += libdbus-tools-common
-#APP_MODULES += libdbus-c++-1
-#APP_MODULES += libdbus-glue
-#APP_MODULES += libsiplink
-#APP_MODULES += libconfig
+APP_MODULES += libdbus-c++-1
+APP_MODULES += libdbus-glue
+APP_MODULES += libsiplink
+APP_MODULES += libconfig
-#APP_MODULES += libcrypto
-#APP_MODULES += libssl
-#APP_MODULES += openssl
+# APP_MODULES += libcrypto
+# APP_MODULES += libssl
+# APP_MODULES += openssl
-#APP_MODULES += libspeex
-#APP_MODULES += libspeexresampler
-#APP_MODULES += libopensl
-#APP_MODULES += libsound
-#APP_MODULES += libcodec_ulaw
-#APP_MODULES += libcodec_alaw
-#APP_MODULES += libcodecfactory
-#APP_MODULES += librtp
-#APP_MODULES += libaudio
-#APP_MODULES += libhistory
-#APP_MODULES += libhooks
+APP_MODULES += libspeex
+APP_MODULES += libspeexresampler
+APP_MODULES += libopensl
+APP_MODULES += libsound
+APP_MODULES += libcodec_ulaw
+APP_MODULES += libcodec_alaw
+APP_MODULES += libcodecfactory
+APP_MODULES += librtp
+APP_MODULES += libaudio
+APP_MODULES += libhistory
+APP_MODULES += libhooks
APP_MODULES += libsflphone
APP_MODULES += sflphoned
diff --git a/jni/sflphone b/jni/sflphone
index c0a81a7da..ddd93dcff 160000
--- a/jni/sflphone
+++ b/jni/sflphone
@@ -1 +1 @@
-Subproject commit c0a81a7da156e66a2ff20080ae674e240858388b
+Subproject commit ddd93dcff024275ffaa52ab172bbe5c528e15f3a
diff --git a/make-swig.sh b/make-swig.sh
index 6facb3865..7f679480f 100755
--- a/make-swig.sh
+++ b/make-swig.sh
@@ -105,6 +105,16 @@ python JavaJNI2CJNI_Load.py \
echo "Appending callmanager_wrap.cpp..."
cat $NATIVE/sflphoneservice_loader.c >> dbus/callmanager_wrap.cpp
+
+#if [ "" != "$(find -iname sflphoneservice_loader.c)" ]; then
+ #
+#fi
+# callmanager_wrap.cpp
+# callmanager_wrap.cpp
+# sflphoneservice.java
+# sflphoneserviceJNI.java
+# ManagerImpl.java
+
echo -n "in " && popd
echo "Done"
exit 0
diff --git a/src/com/savoirfairelinux/sflphone/service/ConfigurationManagerJNI.java b/src/com/savoirfairelinux/sflphone/service/ConfigurationManagerJNI.java
index 6e38495bf..33940a337 100644
--- a/src/com/savoirfairelinux/sflphone/service/ConfigurationManagerJNI.java
+++ b/src/com/savoirfairelinux/sflphone/service/ConfigurationManagerJNI.java
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.8
+ * Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
@@ -219,30 +219,6 @@ public class ConfigurationManagerJNI {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getAudioManager(swigCPtr, this);
}
- public void setMailNotify() {
- SFLPhoneserviceJNI.ConfigurationManagerJNI_setMailNotify(swigCPtr, this);
- }
-
- public SWIGTYPE_p_int32_t getMailNotify() {
- return new SWIGTYPE_p_int32_t(SFLPhoneserviceJNI.ConfigurationManagerJNI_getMailNotify(swigCPtr, this), true);
- }
-
- public SWIGTYPE_p_std__mapT_std__string_int32_t_t getAddressbookSettings() {
- return new SWIGTYPE_p_std__mapT_std__string_int32_t_t(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAddressbookSettings(swigCPtr, this), true);
- }
-
- public void setAddressbookSettings(SWIGTYPE_p_std__mapT_std__string_int32_t_t settings) {
- SFLPhoneserviceJNI.ConfigurationManagerJNI_setAddressbookSettings(swigCPtr, this, SWIGTYPE_p_std__mapT_std__string_int32_t_t.getCPtr(settings));
- }
-
- public StringVect getAddressbookList() {
- return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAddressbookList(swigCPtr, this), true);
- }
-
- public void setAddressbookList(StringVect list) {
- SFLPhoneserviceJNI.ConfigurationManagerJNI_setAddressbookList(swigCPtr, this, StringVect.getCPtr(list), list);
- }
-
public StringMap getHookSettings() {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getHookSettings(swigCPtr, this), true);
}
--
GitLab