Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add unit test for msandroid

Browse source
This commit is contained in:
Jehan Monnier 2011-01-21 14:37:44 +01:00
parent 7d25c0e829
commit 92dcddfdb0
5 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.classpath
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <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/j2se"/>
<classpathentry kind="src" path="submodules/linphone/java/common"/> <classpathentry kind="src" path="submodules/linphone/java/common"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>

8
AndroidManifest.xml
View file

@ -62,6 +62,14 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </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"> <activity android:name=".LinphonePreferencesActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

1
jni/Android.mk
View file

@ -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/oRTP/build/android/Android.mk
include $(root-dir)/submodules/linphone/mediastreamer2/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) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
include $(root-dir)/submodules/msilbc/Android.mk include $(root-dir)/submodules/msilbc/Android.mk

3
jni/Application.mk
View file

@ -1,6 +1,9 @@
APP_PROJECT_PATH := $(call my-dir)/../ 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) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
APP_MODULES +=libmsilbc libavutil libavcore libavcodec libswscale libx264 libmsx264 APP_MODULES +=libmsilbc libavutil libavcore libavcodec libswscale libx264 libmsx264

2
submodules/linphone

@ -1 +1 @@
Subproject commit cab33bd6bab62cdeefb7bb22731a417ed1b28836 Subproject commit fa1e4658bde1b9b3f7abc8745db71d15287694e3