22 commits

Author	SHA1	Message	Date
Yann Diorcet	8dd4ee3ee2	Merge branch 'master' into belle-sip ... Conflicts: build/android/common.mk coreapi/linphonecore.h	2013-03-12 13:30:13 +01:00
Simon Morlat	d450bab4f8	fix android makefile.	2013-03-11 12:03:19 +01:00
Jehan Monnier	5d79ed6fc0	fix android build scripts	2013-03-07 22:21:14 +01:00
Yann Diorcet	673ddcae3d	liblinphone tester: add android mk and modify sources for make it works	2013-03-07 17:33:11 +01:00
Jehan Monnier	5576864405	add jni to check if ms2 was compiled with video	2013-03-04 17:28:55 +01:00
Yann Diorcet	5b14c78bbd	Add sal_op_call_transfer.c to android build	2013-02-20 10:34:12 +01:00
Yann Diorcet	93f5931bfb	Merge branch 'master' of git.linphone.org:linphone into belle-sip ... Conflicts: build/android/common.mk build/android/config.h	2013-02-13 17:21:37 +01:00
Yann Diorcet	04fef5fcca	Add libupnp dependency for Android ... Fix some issues related to uPnP	2013-02-13 16:51:50 +01:00
Jehan Monnier	427ec85ce4	Merge remote-tracking branch 'public/master' into belle-sip ... Conflicts: configure.ac coreapi/sal.c coreapi/sal.h	2013-02-06 10:55:57 +01:00
Ghislain MARY	2ffe757370	Fix android build.	2013-01-28 14:13:14 +01:00
Yann Diorcet	fa4a074f21	Modify Android makefile for belle-sip	2013-01-23 14:07:21 +01:00
Sylvain Berfini	414fcf3841	TAG for android traces can be specified through JNI interface	2012-12-27 12:18:02 +01:00
Simon Morlat	4c346156ce	add missing -Define controlling tls certificate checking by eXosip	2012-12-13 14:50:43 +01:00
Ghislain MARY	cfea850d52	Define HAVE_EXOSIP_GET_VERSION when compiling for Android.	2012-12-12 15:11:42 +01:00
Ghislain MARY	fe595857dd	Include linphonecore_jni.h only if USE_JAVAH is defined.	2012-10-25 15:48:53 +02:00
Ghislain MARY	6b89311813	Include linphonecore_jni.h to check validity of JNI at compilation time.	2012-10-23 11:12:55 +02:00
Simon Morlat	8cdb6923d5	add HAVE_EXOSIP_TRYLOCK to android makefile	2012-10-22 21:54:58 +02:00
Simon Morlat	fd4937409b	Add java interface for chat. ... Add -D for exosip Remove obsolete media_api to avoid confusion	2012-09-05 11:51:26 +02:00
Simon Morlat	dc5b821d22	fix makefile for android	2012-08-09 11:04:23 +02:00
Sylvain Berfini	5f2640d57a	Android Makefile changed to automatically update linphone version	2012-08-02 12:45:15 +02:00
Simon Morlat	9e3835ff16	fix makefile (include linphone_tunnel.cc always)	2012-06-21 10:39:50 +02:00
Sylvain Berfini	f3cadcf4a4	Factorized makefiles	2012-05-23 16:59:45 +02:00