Commit graph

72 commits

Author SHA1 Message Date
Sylvain Berfini
1c46e32932 Added sqlite compilation to liblinphone 2013-08-08 12:46:41 +02:00
Sylvain Berfini
1d91d420ac Renamed ffmepg libraries to force Android to use ours in case the device embed it's own ffmepg 2013-07-11 13:42:23 +02:00
Simon Morlat
e8edaa99d6 Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	jni/Android.mk
	submodules/linphone
2013-06-25 23:42:36 +02:00
Ghislain MARY
b62ff7cf96 libxml2 is now mandatory. 2013-06-21 11:30:07 +02:00
Guillaume Beraudo
a3ad899349 Remove prebuilts, better use the awsome ccache. 2013-06-18 09:37:49 +02:00
Sylvain Berfini
75934a5400 Merge remote-tracking branch 'master/master' into bellesip
Conflicts:
	.classpath
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	src/org/linphone/HistoryDetailFragment.java
	submodules/linphone
2013-06-12 10:59:39 +02:00
Sylvain Berfini
c97ea56bc4 Renamed liblinphone libraries using target cpu and neon presence in names 2013-05-14 12:16:47 +02:00
Ghislain MARY
8ae1cb1a63 libneon is in mediastreamer2. 2013-05-02 10:39:30 +02:00
Simon Morlat
15ed1fed59 Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	jni/Application.mk
	submodules/linphone
2013-04-28 16:18:47 +02:00
Simon Morlat
a2287b9ed0 build libxml2 statically
rename it to liblpxml2 (libxml2 is part of android system already).
2013-04-24 11:59:32 +02:00
Jehan Monnier
cf54476fd3 statically link remote provisionning stuf to liblinphone 2013-04-10 17:28:34 +02:00
Yann Diorcet
a05b8f04a5 Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-04-05 12:51:24 +02:00
Yann Diorcet
420acf98e6 Fix lpc2xml xml2lpc compilation for noneon 2013-04-05 12:49:47 +02:00
Jehan Monnier
c19dfa0f11 add build option to disable polarssl 2013-04-02 09:18:25 +02:00
Simon Morlat
9eb3eec1be integrate polarssl to linphone-android.
update srtp, necessary to avoid symbol conflict.
2013-03-28 17:19:11 +01:00
Sylvain Berfini
a28e6813da CpuUtils moved to mediastreamer 2013-03-22 17:42:13 +01:00
Yann Diorcet
9be8020d4f Merge remote-tracking branch 'origin' into bellesip
Conflicts:
	Makefile
	submodules/linphone
2013-03-08 16:02:07 +01:00
Jehan Monnier
3ece105d03 update belle-sip,linphone 2013-03-04 19:03:22 +01:00
Jehan Monnier
3b34477d4d add new target generate-sdk 2013-03-04 15:24:16 +01:00
Ghislain MARY
558804a1c6 Add missing parenthese. 2013-03-04 14:35:31 +01:00
Yann Diorcet
48f170d468 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	submodules/linphone
2013-02-25 09:29:09 +01:00
Simon Morlat
24a1eceb1e update linphone submodule for new conference recording api. 2013-02-22 21:29:06 +01:00
Yann Diorcet
bfc8d392e2 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	.gitmodules
	submodules/linphone
2013-02-13 17:26:07 +01:00
Yann Diorcet
1b98d34e9a Add libupnp dependency for Android 2013-02-13 16:53:50 +01:00
Yann Diorcet
188fa09cf4 Merge branch 'master' into bellesip
Conflicts:
	.gitmodules
	Makefile
	submodules/externals/build/exosip/Android.mk
	submodules/externals/exosip
	submodules/linphone
2013-02-06 12:22:28 +01:00
Yann Diorcet
72b10a1f32 Add xml2lpc/lpc2xml support and remote provisioning 2013-02-05 10:04:00 +01:00
Yann Diorcet
0fd4a38909 Replace eXosip/osip by belle-sip
add a checktools utility
Add belle-sip
Add antlr3c
2013-01-23 14:08:55 +01:00
Sylvain Berfini
1a1ee48be8 Added libneon to detect neon in NDK instead of reading /proc/cpuinfo 2013-01-18 11:50:50 +01:00
Ghislain MARY
40c254fb67 Do not build for x86 by default. 2012-12-10 17:00:35 +01:00
Ghislain MARY
b625901bc2 Add WebRTC echo canceller. 2012-11-13 17:15:56 +01:00
Ghislain MARY
195c95b21b Add x86 target. 2012-08-21 16:26:28 +02:00
Ghislain MARY
84726a6fbe Changes to be able to debug native code. 2012-08-14 15:48:15 +02:00
Sylvain Berfini
d5cee9f44d Fix for ICS issue with native libs 2012-06-07 09:35:01 +02:00
Sylvain Berfini
81fc525350 Fix last issue with pause + fix shared libs without neon problem 2012-04-17 16:57:37 +02:00
Sylvain Berfini
92455847e9 Temporary fix pause crash, todo: compile both ffmepg and choose the right one 2012-04-17 12:09:21 +02:00
Jehan Monnier
0c5a1885df re enable srtp build by default 2012-02-21 12:46:14 +01:00
Jehan Monnier
97d8312fdf add g729 integration 2012-02-17 11:30:39 +01:00
Guillaume Beraudo
a6d0acc1e0 Move tunnel submodule out of linphone. 2012-02-13 11:15:45 +01:00
Yann Diorcet
9d8d6be92f AMR-WB Integration 2012-01-26 16:00:51 +01:00
Guillaume Beraudo
420698d3b4 Optional tunnel plugin.
Requires a tunnel implementation with Android.mk in
submodules/linphone/tunnel
2011-12-16 10:59:32 +01:00
Simon Morlat
5041b71568 media encryption API enhancements
add preference for media encryption selection.
2011-11-23 22:20:00 +01:00
Guillaume Beraudo
134a98fdc2 Add SILK plugin support. 2011-10-26 11:37:34 +02:00
Pierre-Eric Pelloux-Prayer
0e0a6eec05 Update linphone 2011-10-13 13:44:44 +02:00
Guillaume Beraudo
8a52da78a0 Merge branch 'srtp' of git.linphone.org:linphone-android-private
Conflicts:
	.gitmodules
2011-10-13 13:18:58 +02:00
Pierre-Eric Pelloux-Prayer
c0e8108a12 Enable srtp 2011-10-07 08:51:50 +02:00
Pierre-Eric Pelloux-Prayer
ecc32e221b Fix errors with different Android SDK (3, 5) 2011-09-22 10:50:35 +02:00
Pierre-Eric Pelloux-Prayer
1b0cb40009 android: updated build scripts 2011-09-16 10:41:35 +02:00
Pierre-Eric Pelloux-Prayer
39b61dd9e6 android: libvpx integration to build system 2011-08-09 13:00:38 +02:00
Guillaume Beraudo
374ecb4bdf Use prebuilt libraries if found. 2011-08-02 11:45:23 +02:00
Guillaume Beraudo
10e8a7ab09 ZRTP on old arm devices. 2011-08-01 11:55:46 +02:00