From 92dcddfdb04d130ca385438dbadd23c5512f9a36 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 21 Jan 2011 14:37:44 +0100
Subject: [PATCH] add unit test for msandroid

---
 .classpath          | 1 +
 AndroidManifest.xml | 8 ++++++++
 jni/Android.mk      | 1 +
 jni/Application.mk  | 5 ++++-
 submodules/linphone | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.classpath b/.classpath
index c16c4b45f..cd265c6cd 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="submodules/linphone/mediastreamer2/tests/java"/>
 	<classpathentry kind="src" path="submodules/linphone/java/j2se"/>
 	<classpathentry kind="src" path="submodules/linphone/java/common"/>
 	<classpathentry kind="src" path="gen"/>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b87ec4f0b..0a4da5f69 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -62,6 +62,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
          </activity>
+         <activity android:name="org.mediastreamer2.test.Ring"
+                  android:label="Ring+Echo"
+                  android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+         </activity>         
         <activity android:name=".LinphonePreferencesActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/jni/Android.mk b/jni/Android.mk
index 477bb04af..f3ff0eb5b 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -15,6 +15,7 @@ include $(root-dir)/submodules/externals/build/osip/Android.mk
 include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk
 
 include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
+include $(root-dir)/submodules/linphone/mediastreamer2/tests/Android.mk
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 include $(root-dir)/submodules/msilbc/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index 0b1d358e1..ed5a56a9b 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,6 +1,9 @@
 APP_PROJECT_PATH := $(call my-dir)/../
-APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2  liblinphone
+APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2  liblinphone 
 
+ifeq ($(RING),yes)
+APP_MODULES      += libring
+endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 APP_MODULES      +=libmsilbc libavutil libavcore libavcodec libswscale libx264 libmsx264
diff --git a/submodules/linphone b/submodules/linphone
index cab33bd6b..fa1e4658b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit cab33bd6bab62cdeefb7bb22731a417ed1b28836
+Subproject commit fa1e4658bde1b9b3f7abc8745db71d15287694e3