g729 integration for Android

diff --git a/build/android/Android.mk b/build/android/Android.mk
index a6d703d15c5e75806b19186e092a0124a139fedd..bf02efce8a9cdd7e76e07eab82d43be8b2ec6524 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -132,6 +132,12 @@ LOCAL_CFLAGS += -DHAVE_SILK
 LOCAL_STATIC_LIBRARIES += libmssilk
 endif
 
+ifeq ($(BUILD_G729),1)
+LOCAL_CFLAGS += -DHAVE_G729
+LOCAL_SHARED_LIBRARIES += libbcg729
+LOCAL_STATIC_LIBRARIES += libmsbcg729
+endif
+
 ifeq ($(LINPHONE_VIDEO),1)
 LOCAL_LDLIBS    += -lGLESv2
 LOCAL_STATIC_LIBRARIES += libvpx

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 7fccd4cdf194d6c4defebaae2edc30f122dd03b4..e61f0b8fa40fda776d213a2fe4870cbafa49572d 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -43,6 +43,9 @@ extern "C" void libmsamr_init();
 #ifdef HAVE_SILK
 extern "C" void libmssilk_init();
 #endif
+#ifdef HAVE_G729
+extern "C" void libmsbcg729_init();
+#endif
 #endif /*ANDROID*/
 
 static JavaVM *jvm=0;
@@ -415,6 +418,9 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 #endif
 #ifdef HAVE_SILK
        libmssilk_init();
+#endif
+#ifdef HAVE_G729
+       libmsbcg729_init();
 #endif
        jlong nativePtr = (jlong)linphone_core_new(     &ldata->vTable
                        ,userConfig