[Switch submodule branch] Merge remote-tracking branch 'master-android/master'
Conflicts: .gitmodules
This commit is contained in:
Margaux Clerc
commit
5cda4e34d1
487 changed files with 173498 additions and 17127 deletions
|
|
@ -1,17 +1,17 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="gen"/>
|
|
||||||
<classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="submodules/linphone/mediastreamer2/java/src"/>
|
<classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="submodules/linphone/mediastreamer2/java/src"/>
|
||||||
<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="submodules/linphone/java/impl"/>
|
<classpathentry kind="src" path="submodules/linphone/java/impl"/>
|
||||||
<classpathentry kind="src" path="submodules/externals/axmlrpc/src/main/java"/>
|
<classpathentry kind="src" path="submodules/externals/axmlrpc/src/main/java"/>
|
||||||
<classpathentry kind="src" path="src"/>
|
|
||||||
<classpathentry kind="src" path="submodules/linphone/coreapi/help/java"/>
|
<classpathentry kind="src" path="submodules/linphone/coreapi/help/java"/>
|
||||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||||
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
|
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="libs/gcm.jar"/>
|
<classpathentry exported="true" kind="lib" path="libs/gcm.jar"/>
|
||||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||||
|
<classpathentry kind="src" path="src"/>
|
||||||
|
<classpathentry kind="src" path="gen"/>
|
||||||
<classpathentry kind="output" path="bin/classes"/>
|
<classpathentry kind="output" path="bin/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
||||||
53
.gitignore
vendored
53
.gitignore
vendored
|
|
@ -1,13 +1,40 @@
|
||||||
libs
|
*.orig
|
||||||
obj
|
*.rej
|
||||||
gen
|
.DS_Store
|
||||||
bin
|
.gradle
|
||||||
doc
|
.idea
|
||||||
default.properties
|
.settings
|
||||||
local.properties
|
adb.pid
|
||||||
project.properties
|
bc-android.keystore
|
||||||
tests/*$py.class
|
bin
|
||||||
tests/build.xml
|
build
|
||||||
res/.DS_Store
|
certdata.txt
|
||||||
bc-android.keystore
|
check_tools.mk
|
||||||
res/raw/lpconfig.xsd
|
default.properties
|
||||||
|
doc
|
||||||
|
gen
|
||||||
|
liblinphone-junit-report.xml
|
||||||
|
liblinphonetester_*.zip
|
||||||
|
libs
|
||||||
|
linphone-android.iml
|
||||||
|
linphone-junit-report*.xml
|
||||||
|
linphonetester_*.zip
|
||||||
|
lint.xml
|
||||||
|
local.properties
|
||||||
|
obj
|
||||||
|
proguard-project.txt
|
||||||
|
project.properties
|
||||||
|
res/.DS_Store
|
||||||
|
res/raw/lpconfig.xsd
|
||||||
|
res/raw/rootca.pem
|
||||||
|
submodules/externals/build/cunit/CUnit/
|
||||||
|
submodules/externals/build/ffmpeg/arm/
|
||||||
|
submodules/externals/build/ffmpeg/x86
|
||||||
|
submodules/externals/build/libvpx/arm
|
||||||
|
submodules/externals/build/libvpx/x86
|
||||||
|
submodules/externals/build/openh264/arm
|
||||||
|
submodules/externals/build/openh264/x86
|
||||||
|
tests/*$py.class
|
||||||
|
tests/build.xml
|
||||||
|
tests/project.properties
|
||||||
|
ant_password.properties
|
||||||
|
|
|
||||||
64
.gitmodules
vendored
64
.gitmodules
vendored
|
|
@ -1,12 +1,6 @@
|
||||||
[submodule "linphone"]
|
[submodule "linphone"]
|
||||||
path = submodules/linphone
|
path = submodules/linphone
|
||||||
url = git://git.linphone.org/linphone.git
|
url = git://git.linphone.org/linphone
|
||||||
[submodule "submodules/externals/osip"]
|
|
||||||
path = submodules/externals/osip
|
|
||||||
url = git://git.linphone.org/osip.git
|
|
||||||
[submodule "submodules/externals/exosip"]
|
|
||||||
path = submodules/externals/exosip
|
|
||||||
url = git://git.linphone.org/exosip.git
|
|
||||||
[submodule "submodules/externals/gsm"]
|
[submodule "submodules/externals/gsm"]
|
||||||
path = submodules/externals/gsm
|
path = submodules/externals/gsm
|
||||||
url = git://git.linphone.org/gsm.git
|
url = git://git.linphone.org/gsm.git
|
||||||
|
|
@ -22,27 +16,28 @@
|
||||||
[submodule "submodules/externals/ffmpeg"]
|
[submodule "submodules/externals/ffmpeg"]
|
||||||
path = submodules/externals/ffmpeg
|
path = submodules/externals/ffmpeg
|
||||||
url = git://git.linphone.org/ffmpeg.git
|
url = git://git.linphone.org/ffmpeg.git
|
||||||
|
ignore = dirty
|
||||||
[submodule "submodules/externals/x264"]
|
[submodule "submodules/externals/x264"]
|
||||||
path = submodules/externals/x264
|
path = submodules/externals/x264
|
||||||
url = git://git.linphone.org/x264.git
|
url = git://git.linphone.org/x264.git
|
||||||
|
ignore = dirty
|
||||||
[submodule "submodules/msx264"]
|
[submodule "submodules/msx264"]
|
||||||
path = submodules/msx264
|
path = submodules/msx264
|
||||||
url = git://git.linphone.org/msx264.git
|
url = git://git.linphone.org/msx264.git
|
||||||
[submodule "submodules/externals/openssl"]
|
|
||||||
path = submodules/externals/openssl
|
|
||||||
url = git://git.linphone.org/android-openssl.git
|
|
||||||
[submodule "submodules/externals/opencore-amr"]
|
[submodule "submodules/externals/opencore-amr"]
|
||||||
path = submodules/externals/opencore-amr
|
path = submodules/externals/opencore-amr
|
||||||
url = git://opencore-amr.git.sourceforge.net/gitroot/opencore-amr/opencore-amr
|
url = git://git.linphone.org/opencore-amr.git
|
||||||
|
ignore = dirty
|
||||||
[submodule "submodules/msamr"]
|
[submodule "submodules/msamr"]
|
||||||
path = submodules/msamr
|
path = submodules/msamr
|
||||||
url = git://git.linphone.org/msamr
|
url = git://git.linphone.org/msamr
|
||||||
[submodule "submodules/externals/libvpx"]
|
[submodule "submodules/externals/libvpx"]
|
||||||
path = submodules/externals/libvpx
|
path = submodules/externals/libvpx
|
||||||
url = http://git.chromium.org/webm/libvpx.git
|
url = https://chromium.googlesource.com/webm/libvpx
|
||||||
[submodule "submodules/externals/libzrtpcpp"]
|
ignore = dirty
|
||||||
path = submodules/externals/libzrtpcpp
|
[submodule "submodules/bzrtp"]
|
||||||
url = git://git.linphone.org/zrtpcpp.git
|
path = submodules/bzrtp
|
||||||
|
url = git://git.linphone.org/bzrtp.git
|
||||||
[submodule "submodules/externals/srtp"]
|
[submodule "submodules/externals/srtp"]
|
||||||
path = submodules/externals/srtp
|
path = submodules/externals/srtp
|
||||||
url = git://git.linphone.org/srtp.git
|
url = git://git.linphone.org/srtp.git
|
||||||
|
|
@ -51,19 +46,48 @@
|
||||||
url = git://git.linphone.org/mssilk.git
|
url = git://git.linphone.org/mssilk.git
|
||||||
[submodule "submodules/externals/vo-amrwbenc"]
|
[submodule "submodules/externals/vo-amrwbenc"]
|
||||||
path = submodules/externals/vo-amrwbenc
|
path = submodules/externals/vo-amrwbenc
|
||||||
url = git://opencore-amr.git.sourceforge.net/gitroot/opencore-amr/vo-amrwbenc
|
url = git://git.linphone.org/vo-amrwbenc.git
|
||||||
[submodule "submodules/bcg729"]
|
[submodule "submodules/bcg729"]
|
||||||
path = submodules/bcg729
|
path = submodules/bcg729
|
||||||
url = git://git.linphone.org/bcg729.git
|
url = git://git.linphone.org/bcg729.git
|
||||||
[submodule "submodules/externals/webrtc"]
|
[submodule "submodules/belle-sip"]
|
||||||
path = submodules/externals/webrtc
|
path = submodules/belle-sip
|
||||||
url = git://git.linphone.org/webrtc.git
|
url = git://git.linphone.org/belle-sip
|
||||||
|
[submodule "submodules/externals/antlr3"]
|
||||||
|
path = submodules/externals/antlr3
|
||||||
|
url = git://git.linphone.org/antlr3.git
|
||||||
[submodule "submodules/externals/libxml2"]
|
[submodule "submodules/externals/libxml2"]
|
||||||
path = submodules/externals/libxml2
|
path = submodules/externals/libxml2
|
||||||
url = git://git.gnome.org/libxml2
|
url = git://git.gnome.org/libxml2
|
||||||
[submodule "submodules/externals/libupnp"]
|
[submodule "submodules/externals/libupnp"]
|
||||||
path = submodules/externals/libupnp
|
path = submodules/externals/libupnp
|
||||||
url = git://git.code.sf.net/p/pupnp/code
|
url = git://git.linphone.org/libupnp.git
|
||||||
|
[submodule "submodules/externals/cunit"]
|
||||||
|
path = submodules/externals/cunit
|
||||||
|
url = git://git.linphone.org/cunit.git
|
||||||
[submodule "submodules/externals/axmlrpc"]
|
[submodule "submodules/externals/axmlrpc"]
|
||||||
path = submodules/externals/axmlrpc
|
path = submodules/externals/axmlrpc
|
||||||
url = git://git.linphone.org/axmlrpc.git
|
url = git://git.linphone.org/axmlrpc.git
|
||||||
|
[submodule "submodules/externals/polarssl"]
|
||||||
|
path = submodules/externals/polarssl
|
||||||
|
url = git://git.linphone.org/polarssl.git
|
||||||
|
[submodule "submodules/externals/opus"]
|
||||||
|
path = submodules/externals/opus
|
||||||
|
url = git://git.opus-codec.org/opus.git
|
||||||
|
[submodule "submodules/mswebrtc"]
|
||||||
|
path = submodules/mswebrtc
|
||||||
|
url = git://git.linphone.org/mswebrtc.git
|
||||||
|
[submodule "submodules/msopenh264"]
|
||||||
|
path = submodules/msopenh264
|
||||||
|
url = git://git.linphone.org/msopenh264.git
|
||||||
|
[submodule "submodules/externals/openh264"]
|
||||||
|
path = submodules/externals/openh264
|
||||||
|
url = https://github.com/cisco/openh264
|
||||||
|
ignore = dirty
|
||||||
|
[submodule "submodules/externals/libmatroska"]
|
||||||
|
path = submodules/externals/libmatroska
|
||||||
|
url = https://github.com/Matroska-Org/foundation-source.git
|
||||||
|
ignore = dirty
|
||||||
|
[submodule "submodules/externals/webrtc"]
|
||||||
|
path = submodules/externals/webrtc
|
||||||
|
url = git://git.linphone.org/webrtc.git
|
||||||
|
|
|
||||||
15
.tx/config
Normal file
15
.tx/config
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
[main]
|
||||||
|
host = https://www.transifex.com
|
||||||
|
lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,sv_SE:sv-rSE,kn_IN:kn-rIN,nl_NL:nl-rNL,en_NL:en-rNL
|
||||||
|
minimum_perc = 1
|
||||||
|
type = ANDROID
|
||||||
|
|
||||||
|
[linphone-android.stringsxml]
|
||||||
|
file_filter = res/values-<lang>/strings.xml
|
||||||
|
source_file = res/values/strings.xml
|
||||||
|
source_lang = en
|
||||||
|
|
||||||
|
[linphone-android.customxml]
|
||||||
|
file_filter = res/values-<lang>/custom.xml
|
||||||
|
source_file = res/values/custom.xml
|
||||||
|
source_lang = en
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.linphone"
|
package="org.linphone"
|
||||||
android:versionCode="2120" android:installLocation="auto">
|
android:versionCode="2411" android:installLocation="auto">
|
||||||
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17"/>
|
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="22"/>
|
||||||
|
|
||||||
<!-- Permissions for Push Notification -->
|
<!-- Permissions for Push Notification -->
|
||||||
<permission android:name="org.linphone.permission.C2D_MESSAGE" android:protectionLevel="signature" />
|
<permission android:name="org.linphone.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <!-- Change package ! -->
|
||||||
<uses-permission android:name="org.linphone.permission.C2D_MESSAGE" />
|
<uses-permission android:name="org.linphone.permission.C2D_MESSAGE" /> <!-- Change package ! -->
|
||||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
|
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
|
||||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
|
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
|
||||||
|
|
@ -36,7 +35,12 @@
|
||||||
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
|
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
|
||||||
<!-- Needed to pre fill the wizard email field (only if enabled in custom settings) -->
|
<!-- Needed to pre fill the wizard email field (only if enabled in custom settings) -->
|
||||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
|
||||||
|
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
|
||||||
|
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
|
||||||
|
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
|
||||||
|
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
|
||||||
|
|
||||||
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
|
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
|
||||||
|
|
||||||
<application android:label="@string/app_name" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true" android:allowBackup="true">
|
<application android:label="@string/app_name" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true" android:allowBackup="true">
|
||||||
|
|
@ -44,6 +48,7 @@
|
||||||
<activity android:name="org.linphone.LinphoneLauncherActivity"
|
<activity android:name="org.linphone.LinphoneLauncherActivity"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:windowSoftInputMode="adjustPan|stateHidden"
|
android:windowSoftInputMode="adjustPan|stateHidden"
|
||||||
|
android:exported="true"
|
||||||
android:theme="@style/NoTitle">
|
android:theme="@style/NoTitle">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
@ -55,7 +60,7 @@
|
||||||
<action android:name="android.intent.action.CALL_PRIVILEGED" />
|
<action android:name="android.intent.action.CALL_PRIVILEGED" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<data android:scheme="tel" />
|
<data android:scheme="tel" />
|
||||||
<data android:scheme="sip" />
|
<data android:scheme="sip" /> />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
|
|
@ -63,17 +68,25 @@
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<data android:scheme="sip" />
|
<data android:scheme="sip" />
|
||||||
<data android:scheme="imto" />
|
<data android:scheme="imto" />
|
||||||
|
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
|
<intent-filter>
|
||||||
|
<data android:mimeType="vnd.android.cursor.item/org.linphone.profile" />
|
||||||
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
</intent-filter>
|
||||||
|
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name="org.linphone.LinphoneActivity"
|
<activity android:name="org.linphone.LinphoneActivity"
|
||||||
android:theme="@style/NoTitle"
|
android:theme="@style/NoTitle"
|
||||||
android:screenOrientation="nosensor"
|
android:screenOrientation="behind"
|
||||||
android:launchMode="singleTask">
|
android:launchMode="singleTask">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name="org.linphone.IncomingCallActivity"
|
<activity android:name="org.linphone.IncomingCallActivity"
|
||||||
|
|
@ -89,10 +102,27 @@
|
||||||
<activity android:name="org.linphone.InCallActivity"
|
<activity android:name="org.linphone.InCallActivity"
|
||||||
android:theme="@style/FullScreen"
|
android:theme="@style/FullScreen"
|
||||||
android:noHistory="true"
|
android:noHistory="true"
|
||||||
android:launchMode="singleTask">
|
android:launchMode="singleTop">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
|
<!--<intent-filter>
|
||||||
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
<data android:mimeType="audio/*" />
|
||||||
|
<data android:mimeType="video/*" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
</intent-filter>-->
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<activity android:name="org.linphone.ChatActivity"
|
||||||
|
android:theme="@style/NoTitle"
|
||||||
|
android:configChanges="orientation|screenSize|keyboardHidden"
|
||||||
|
android:windowSoftInputMode="adjustPan|adjustResize"
|
||||||
|
android:launchMode="singleTask">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name="org.linphone.setup.SetupActivity"
|
<activity android:name="org.linphone.setup.SetupActivity"
|
||||||
|
|
@ -102,21 +132,59 @@
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<activity android:name="org.linphone.setup.RemoteProvisioningLoginActivity"
|
||||||
|
android:theme="@style/NoTitle"
|
||||||
|
android:screenOrientation="nosensor">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<activity android:name="org.linphone.setup.RemoteProvisioningActivity"
|
||||||
|
android:theme="@style/NoTitle"
|
||||||
|
android:screenOrientation="nosensor">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
</intent-filter>
|
||||||
|
|
||||||
|
<intent-filter>
|
||||||
|
<data android:scheme="linphone-config" /> <!-- Change if needed -->
|
||||||
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
<service android:name="org.linphone.LinphoneService"
|
<service android:name="org.linphone.LinphoneService"
|
||||||
android:label="@string/service_name"
|
android:label="@string/service_name"
|
||||||
android:stopWithTask="false"/>
|
android:stopWithTask="false"/>
|
||||||
|
|
||||||
<receiver android:name="org.linphone.NetworkManager">
|
<service
|
||||||
|
android:name="org.linphone.sync.SyncService"
|
||||||
|
android:exported="true">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.content.SyncAdapter" />
|
||||||
|
</intent-filter>
|
||||||
|
<meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
|
||||||
|
<meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contacts" />
|
||||||
|
</service>
|
||||||
|
|
||||||
|
<service
|
||||||
|
android:name="org.linphone.sync.AuthenticationService">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.accounts.AccountAuthenticator"/>
|
||||||
|
</intent-filter>
|
||||||
|
<meta-data
|
||||||
|
android:name="android.accounts.AccountAuthenticator"
|
||||||
|
android:resource="@xml/authenticator" />
|
||||||
|
</service>
|
||||||
|
|
||||||
|
<receiver android:name="org.linphone.NetworkManager">
|
||||||
<intent-filter><action android:name="android.net.conn.CONNECTIVITY_CHANGE"></action></intent-filter>
|
<intent-filter><action android:name="android.net.conn.CONNECTIVITY_CHANGE"></action></intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<receiver android:name="org.linphone.BluetoothManager">
|
<receiver android:name="org.linphone.BluetoothManager" android:enabled="false">
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.bluetooth.device.action.ACL_CONNECTED"/>
|
|
||||||
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED"/>
|
|
||||||
<action android:name="android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED"/>
|
|
||||||
</intent-filter>
|
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<receiver android:name="org.linphone.BootReceiver">
|
<receiver android:name="org.linphone.BootReceiver">
|
||||||
|
|
@ -127,18 +195,21 @@
|
||||||
<intent-filter><action android:name="android.intent.action.PHONE_STATE" /></intent-filter>
|
<intent-filter><action android:name="android.intent.action.PHONE_STATE" /></intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
|
<receiver android:name="KeepAliveHandler" >
|
||||||
|
</receiver>
|
||||||
|
|
||||||
<!-- Needed for push notification -->
|
<!-- Needed for push notification -->
|
||||||
<receiver android:name="org.linphone.gcm.GCMReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
|
<receiver android:name="org.linphone.gcm.GCMReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
|
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
|
||||||
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
|
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
|
||||||
<category android:name="org.linphone" />
|
<category android:name="org.linphone" /> <!-- Change package ! -->
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<service android:name="org.linphone.gcm.GCMService" />
|
<service android:name="org.linphone.gcm.GCMService" />
|
||||||
|
|
||||||
<activity android:name="org.linphone.tutorials.TutorialLauncherActivity"
|
<activity android:name="org.linphone.tutorials.TutorialLauncherActivity"
|
||||||
android:theme="@style/NoTitle">
|
android:theme="@style/NoTitle">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
|
||||||
523
Makefile
523
Makefile
|
|
@ -1,37 +1,134 @@
|
||||||
NDK_PATH=$(shell dirname `which ndk-build`)
|
NDK_PATH=$(shell dirname `which ndk-build`)
|
||||||
|
NDK_MAJOR_VERSION=$(shell cat $(NDK_PATH)/RELEASE.TXT | sed "s/r\([0-9]\{1,2\}\).*/\1/")
|
||||||
SDK_PATH=$(shell dirname `which android`)
|
SDK_PATH=$(shell dirname `which android`)
|
||||||
SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`)
|
SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`)
|
||||||
NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
|
ARM_COMPILER_PATH=`find "$(NDK_PATH)" -name "arm-linux-androideabi-gcc-4*" -print | tail -1`
|
||||||
|
ARM_TOOLCHAIN_PATH=$(shell dirname $(ARM_COMPILER_PATH))/arm-linux-androideabi-
|
||||||
|
X86_COMPILER_PATH=`find "$(NDK_PATH)" -name "i686-linux-android-gcc-4*" -print | tail -1`
|
||||||
|
X86_TOOLCHAIN_PATH=$(shell dirname $(X86_COMPILER_PATH))/i686-linux-android-
|
||||||
|
NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo 2>/dev/null || echo "4" )
|
||||||
TOPDIR=$(shell pwd)
|
TOPDIR=$(shell pwd)
|
||||||
PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
|
LIBLINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always)
|
||||||
LINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always)
|
|
||||||
LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always)
|
LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always)
|
||||||
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
|
BELLESIP_VERSION_SCRIPT:=cat submodules/belle-sip/configure.ac | grep "AC_INIT(" | sed -e "s/.*belle-sip\]//" | sed -e "s/].*//" | sed -e "s/.*\[//"
|
||||||
|
BELLESIP_VERSION=$(shell $(BELLESIP_VERSION_SCRIPT))
|
||||||
|
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep -E 'android-[0-9]+' | tail -n1)
|
||||||
|
#We force target 19 because 21 creates binaries incompatible with older versions due to rand() function no longer inline (congrats to Google's developers)
|
||||||
|
NDKBUILD_TARGET=android-19
|
||||||
|
#The NDK target used to compile external third parties (ffmpeg, x264)
|
||||||
|
EXTERNAL_MAKE_TARGET=14
|
||||||
|
ARM_SYSROOT=${NDK_PATH}/platforms/android-$(EXTERNAL_MAKE_TARGET)/arch-arm
|
||||||
|
X86_SYSROOT=${NDK_PATH}/platforms/android-$(EXTERNAL_MAKE_TARGET)/arch-x86
|
||||||
|
SQLITE_VERSION=3071700
|
||||||
|
SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION)
|
||||||
|
SQLITE_URL=http://www.sqlite.org/2013/$(SQLITE_BASENAME).zip
|
||||||
|
ENABLE_GPL_THIRD_PARTIES=1
|
||||||
|
#override CC variable to disable compiler specific FLAGS in configure using the system compiler instead of the android one
|
||||||
|
CC=
|
||||||
|
PACKAGE_NAME=$(shell sed -nE 's|<property name="linphone.package.name" value="(.*)" />|\1|p' custom_rules.xml)
|
||||||
|
#default options, can be overidden using make OPTION=value .
|
||||||
|
|
||||||
|
ifeq ($(ENABLE_GPL_THIRD_PARTIES),1)
|
||||||
|
BUILD_G729=1
|
||||||
|
else
|
||||||
|
#x264 and g729 requires additional licensing agreements.
|
||||||
|
BUILD_X264=0
|
||||||
|
BUILD_G729=0
|
||||||
|
endif
|
||||||
|
|
||||||
NDK_DEBUG=0
|
NDK_DEBUG=0
|
||||||
|
BUILD_VIDEO=1
|
||||||
|
BUILD_OPENH264=1
|
||||||
|
BUILD_NON_FREE_CODECS=1
|
||||||
|
ENABLE_OPENH264_DECODER=1
|
||||||
BUILD_UPNP=1
|
BUILD_UPNP=1
|
||||||
BUILD_REMOTE_PROVISIONING=1
|
|
||||||
BUILD_X264=1
|
|
||||||
BUILD_AMRNB=full # 0, light or full
|
BUILD_AMRNB=full # 0, light or full
|
||||||
BUILD_AMRWB=0
|
BUILD_AMRWB=1
|
||||||
BUILD_GPLV3_ZRTP=0
|
BUILD_ZRTP=1
|
||||||
BUILD_SILK=1
|
BUILD_SILK=1
|
||||||
BUILD_G729=0
|
|
||||||
BUILD_TUNNEL=0
|
BUILD_TUNNEL=0
|
||||||
BUILD_WEBRTC_AECM=1
|
BUILD_WEBRTC_AECM=1
|
||||||
|
BUILD_OPUS=1
|
||||||
|
BUILD_MATROSKA=1
|
||||||
|
BUILD_WEBRTC_ISAC=1
|
||||||
BUILD_FOR_X86=1
|
BUILD_FOR_X86=1
|
||||||
|
BUILD_FOR_ARM=1
|
||||||
USE_JAVAH=1
|
USE_JAVAH=1
|
||||||
|
BUILD_TLS=1
|
||||||
|
BUILD_SQLITE=1
|
||||||
|
BUILD_CONTACT_HEADER=0
|
||||||
|
BUILD_RTP_MAP=0
|
||||||
|
BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
|
||||||
|
BUILD_ILBC=1
|
||||||
|
LIBLINPHONE_EXTENDED_SRC_FILES=
|
||||||
|
LIBLINPHONE_EXTENDED_C_INCLUDES=
|
||||||
|
LIBLINPHONE_EXTENDED_CFLAGS=
|
||||||
|
APP_STL=stlport_static
|
||||||
|
ANT_SILENT=$(shell ant -h | grep -q -- -S && echo 1 || echo 0)
|
||||||
|
|
||||||
NDK_BUILD_OPTIONS=NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) -j$(NUMCPUS)
|
# Checks
|
||||||
|
CHECK_MSG=$(shell ./check_tools.sh)
|
||||||
|
|
||||||
all: update-project prepare-sources generate-apk
|
ifneq ($(CHECK_MSG),)
|
||||||
|
$(error Some tools are missing.)
|
||||||
|
else
|
||||||
|
ifeq ($(BUILD_OPENH264),1)
|
||||||
|
ifneq ($(shell echo $(NDK_MAJOR_VERSION)\>=10 | bc),1)
|
||||||
|
$(error ndk version [$(NDK_MAJOR_VERSION)] not compatible with openh264.)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
include check_tools.mk
|
||||||
|
endif
|
||||||
|
|
||||||
|
OPENSSL_DIR=$(shell openssl version -d | sed "s/OPENSSLDIR: \"\(.*\)\"/\1/")
|
||||||
|
ifneq ($(shell ls $(OPENSSL_DIR)/certs),)
|
||||||
|
HTTPS_CA_DIR=$(OPENSSL_DIR)/certs
|
||||||
|
else
|
||||||
|
HTTPS_CA_DIR=$(OPENSSL_DIR)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(ANT_SILENT), 1)
|
||||||
|
ANT=ant -e -S
|
||||||
|
else
|
||||||
|
ANT=ant -e
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Temporary check: in case of MediastreamActivity.java file existing while it should not anymore, print an error message
|
||||||
|
# and abort build since otherwise java compilation will fail.
|
||||||
|
ifneq ($(shell ls ./submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java 2>/dev/null),)
|
||||||
|
$(error ./submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java found: please either remove it or move it to MediastreamActivity.java.ignored before continuing.)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_NON_FREE_CODECS), 0)
|
||||||
|
BUILD_OPENH264=0
|
||||||
|
ENABLE_OPENH264_DECODER=0
|
||||||
|
BUILD_AMRNB=0
|
||||||
|
BUILD_AMRWB=0
|
||||||
|
BUILD_G729=0
|
||||||
|
BUILD_X264=0
|
||||||
|
endif
|
||||||
|
|
||||||
|
all: update-project generate-apk
|
||||||
|
ifeq ($(ENABLE_GPL_THIRD_PARTIES),1)
|
||||||
|
@echo "***************************************************************************"
|
||||||
|
@echo "***** CAUTION, this liblinphone SDK is built using 3rd party GPL code *****"
|
||||||
|
@echo "***** Even if you acquired a proprietary license from Belledonne *****"
|
||||||
|
@echo "***** Communications, this SDK is GPL and GPL only. *****"
|
||||||
|
@echo "***** To disable 3rd party gpl code, please use: *****"
|
||||||
|
@echo "***** $$ make ENABLE_GPL_THIRD_PARTIES=0 *****"
|
||||||
|
@echo "***************************************************************************"
|
||||||
|
else
|
||||||
|
@echo
|
||||||
|
@echo "*****************************************************************"
|
||||||
|
@echo "***** Linphone SDK without 3rd party GPL software *****"
|
||||||
|
@echo "***** If you acquired a proprietary license from Belledonne *****"
|
||||||
|
@echo "***** Communications, this SDK can be used to create *****"
|
||||||
|
@echo "***** a proprietary linphone-based application. *****"
|
||||||
|
@echo "*****************************************************************"
|
||||||
|
endif
|
||||||
|
|
||||||
install: install-apk run-linphone
|
install: install-apk run-linphone
|
||||||
|
|
||||||
prepare-ffmpeg:
|
|
||||||
ifeq ($(PATCH_FFMPEG),)
|
|
||||||
@patch -p0 < $(TOPDIR)/patches/ffmpeg_scalar_product_remove_alignment_hints.patch
|
|
||||||
endif
|
|
||||||
#libilbc
|
#libilbc
|
||||||
LIBILBC_SRC_DIR=$(TOPDIR)/submodules/libilbc-rfc3951
|
LIBILBC_SRC_DIR=$(TOPDIR)/submodules/libilbc-rfc3951
|
||||||
LIBILBC_BUILD_DIR=$(LIBILBC_SRC_DIR)
|
LIBILBC_BUILD_DIR=$(LIBILBC_SRC_DIR)
|
||||||
|
|
@ -45,41 +142,206 @@ $(LIBILBC_BUILD_DIR)/Makefile: $(LIBILBC_SRC_DIR)/configure
|
||||||
$(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
|
$(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
|
||||||
cd $(LIBILBC_BUILD_DIR)/downloads && make \
|
cd $(LIBILBC_BUILD_DIR)/downloads && make \
|
||||||
|| ( echo "iLBC prepare stage failed" ; exit 1 )
|
|| ( echo "iLBC prepare stage failed" ; exit 1 )
|
||||||
|
|
||||||
|
ifeq ($(BUILD_ILBC),1)
|
||||||
prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
|
prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
|
||||||
|
else
|
||||||
|
prepare-ilbc:
|
||||||
|
endif
|
||||||
|
|
||||||
|
#ffmpeg
|
||||||
|
ifeq ($(BUILD_VIDEO),1)
|
||||||
|
BUILD_FFMPEG_DEPS=$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt $(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so
|
||||||
|
ifeq ($(BUILD_FOR_X86), 1)
|
||||||
|
BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libffmpeg-linphone-x86.so
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
FFMPEG_SRC_DIR=$(TOPDIR)/submodules/externals/ffmpeg
|
||||||
|
FFMPEG_BUILD_DIR=$(TOPDIR)/submodules/externals/build/ffmpeg
|
||||||
|
FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runtime-cpudetect \
|
||||||
|
--disable-everything --disable-doc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver \
|
||||||
|
--disable-avdevice --disable-avfilter --disable-avformat --disable-swresample --disable-network \
|
||||||
|
--enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 \
|
||||||
|
--enable-decoder=h263p --enable-encoder=h263p --enable-decoder=h263 --enable-encoder=h263 --extra-cflags="-w" \
|
||||||
|
--disable-static --enable-shared --disable-symver
|
||||||
|
FFMPEG_ARM_CONFIGURE_OPTIONS=--build-suffix=-linphone-arm --arch=arm --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic
|
||||||
|
FFMPEG_X86_CONFIGURE_OPTIONS=--build-suffix=-linphone-x86 --arch=x86 --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH) --disable-mmx --disable-sse2 --disable-ssse3 --extra-cflags='-O3'
|
||||||
|
|
||||||
|
$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt:
|
||||||
|
@patch -p0 < $(TOPDIR)/patches/ffmpeg_non_versioned_soname.patch
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
$(FFMPEG_BUILD_DIR)/arm/config.h:
|
||||||
|
mkdir -p $(FFMPEG_BUILD_DIR)/arm && \
|
||||||
|
cd $(FFMPEG_BUILD_DIR)/arm && \
|
||||||
|
$(FFMPEG_SRC_DIR)/configure $(FFMPEG_CONFIGURE_OPTIONS) $(FFMPEG_ARM_CONFIGURE_OPTIONS)
|
||||||
|
sed -i.bak 's/#define HAVE_SYSCTL 1/#define HAVE_SYSCTL 0/g' $(FFMPEG_BUILD_DIR)/arm/config.h
|
||||||
|
sed -i.bak 's/#define HAVE_GETHRTIME 1/#define HAVE_GETHRTIME 0/g' $(FFMPEG_BUILD_DIR)/arm/config.h
|
||||||
|
|
||||||
|
$(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so: $(FFMPEG_BUILD_DIR)/arm/config.h
|
||||||
|
cd $(FFMPEG_BUILD_DIR)/arm && \
|
||||||
|
make -j${NUMCPUS} \
|
||||||
|
|| ( echo "Build of ffmpeg for arm failed." ; exit 1 )
|
||||||
|
|
||||||
|
$(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so: $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so
|
||||||
|
cd $(FFMPEG_BUILD_DIR)/arm && \
|
||||||
|
rm libavcodec/log2_tab.o && \
|
||||||
|
$(ARM_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(ARM_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/arm/*.o libavcodec/*.o libavcodec/arm/*.o libswscale/*.o -o libffmpeg-linphone-arm.so
|
||||||
|
|
||||||
|
$(FFMPEG_BUILD_DIR)/x86/config.h:
|
||||||
|
mkdir -p $(FFMPEG_BUILD_DIR)/x86 && \
|
||||||
|
cd $(FFMPEG_BUILD_DIR)/x86 && \
|
||||||
|
$(FFMPEG_SRC_DIR)/configure $(FFMPEG_CONFIGURE_OPTIONS) $(FFMPEG_X86_CONFIGURE_OPTIONS)
|
||||||
|
sed -i.bak 's/#define HAVE_SYSCTL 1/#define HAVE_SYSCTL 0/g' $(FFMPEG_BUILD_DIR)/x86/config.h
|
||||||
|
sed -i.bak 's/#define HAVE_GETHRTIME 1/#define HAVE_GETHRTIME 0/g' $(FFMPEG_BUILD_DIR)/x86/config.h
|
||||||
|
|
||||||
|
$(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so: $(FFMPEG_BUILD_DIR)/x86/config.h
|
||||||
|
cd $(FFMPEG_BUILD_DIR)/x86 && \
|
||||||
|
make -j${NUMCPUS} \
|
||||||
|
|| ( echo "Build of ffmpeg for x86 failed." ; exit 1 )
|
||||||
|
|
||||||
|
$(FFMPEG_BUILD_DIR)/x86/libffmpeg-linphone-x86.so: $(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so
|
||||||
|
cd $(FFMPEG_BUILD_DIR)/x86 && \
|
||||||
|
rm libavcodec/log2_tab.o && \
|
||||||
|
$(X86_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(X86_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/x86/*.o libavcodec/*.o libavcodec/x86/*.o libswscale/*.o -o libffmpeg-linphone-x86.so
|
||||||
|
|
||||||
|
build-ffmpeg: $(BUILD_FFMPEG_DEPS)
|
||||||
|
|
||||||
|
clean-ffmpeg:
|
||||||
|
rm -rf $(FFMPEG_BUILD_DIR)/arm && \
|
||||||
|
rm -rf $(FFMPEG_BUILD_DIR)/x86
|
||||||
|
|
||||||
|
#x264
|
||||||
|
ifeq ($(BUILD_VIDEO),1)
|
||||||
|
ifeq ($(BUILD_X264), 1)
|
||||||
|
BUILD_X264_DEPS=$(X264_SRC_DIR)/log2f_fix_patch_applied.txt $(X264_BUILD_DIR)/arm/libx264.a
|
||||||
|
ifeq ($(BUILD_FOR_X86), 1)
|
||||||
|
BUILD_X264_DEPS+=$(X264_BUILD_DIR)/x86/libx264.a
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
X264_SRC_DIR=$(TOPDIR)/submodules/externals/x264
|
||||||
|
X264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/x264
|
||||||
|
X264_CONFIGURE_OPTIONS=--enable-static
|
||||||
|
X264_ARM_CONFIGURE_OPTIONS=--host=arm-none-linux-gnueabi --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic
|
||||||
|
X264_X86_CONFIGURE_OPTIONS=--host=i686-linux-gnueabi --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH)
|
||||||
|
|
||||||
|
$(X264_SRC_DIR)/log2f_fix_patch_applied.txt:
|
||||||
|
@patch -p0 < $(TOPDIR)/patches/x264_log2f_fix.patch
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
$(X264_BUILD_DIR)/arm/libx264.a:
|
||||||
|
mkdir -p $(X264_BUILD_DIR)/arm && \
|
||||||
|
cd $(X264_SRC_DIR) && \
|
||||||
|
$(X264_SRC_DIR)/configure $(X264_CONFIGURE_OPTIONS) $(X264_ARM_CONFIGURE_OPTIONS) && \
|
||||||
|
make -j$(NUMCPUS) STRIP= && \
|
||||||
|
cp libx264.a $(X264_BUILD_DIR)/arm/libx264.a && \
|
||||||
|
make clean \
|
||||||
|
|| ( echo "Build of x264 for arm failed." ; exit 1 )
|
||||||
|
|
||||||
|
$(X264_BUILD_DIR)/x86/libx264.a:
|
||||||
|
mkdir -p $(X264_BUILD_DIR)/x86 && \
|
||||||
|
cd $(X264_SRC_DIR) && \
|
||||||
|
$(X264_SRC_DIR)/configure $(X264_CONFIGURE_OPTIONS) $(X264_X86_CONFIGURE_OPTIONS) && \
|
||||||
|
make -j$(NUMCPUS) STRIP= && \
|
||||||
|
cp libx264.a $(X264_BUILD_DIR)/x86/libx264.a && \
|
||||||
|
make clean \
|
||||||
|
|| ( echo "Build of x264 for x86 failed." ; exit 1 )
|
||||||
|
|
||||||
|
endif
|
||||||
|
build-x264: $(BUILD_X264_DEPS)
|
||||||
|
|
||||||
|
clean-x264:
|
||||||
|
rm -rf $(X264_BUILD_DIR)/arm && \
|
||||||
|
rm -rf $(X264_BUILD_DIR)/x86
|
||||||
|
|
||||||
|
#openh264
|
||||||
|
ifeq ($(BUILD_VIDEO),1)
|
||||||
|
ifeq ($(BUILD_OPENH264), 1)
|
||||||
|
BUILD_OPENH264_DEPS=build-openh264-arm
|
||||||
|
ifeq ($(BUILD_FOR_X86), 1)
|
||||||
|
BUILD_OPENH264_DEPS+=build-openh264-x86
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
OPENH264_SRC_DIR=$(TOPDIR)/submodules/externals/openh264
|
||||||
|
OPENH264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/openh264
|
||||||
|
OPENH264_BUILD_DIR_ARM=$(OPENH264_BUILD_DIR)/arm
|
||||||
|
OPENH264_BUILD_DIR_X86=$(OPENH264_BUILD_DIR)/x86
|
||||||
|
|
||||||
|
$(OPENH264_SRC_DIR)/patch.stamp: $(TOPDIR)/patches/openh264-permissive.patch
|
||||||
|
cd $(OPENH264_SRC_DIR) && patch -p1 < $(TOPDIR)/patches/openh264-permissive.patch && touch $(OPENH264_SRC_DIR)/patch.stamp
|
||||||
|
|
||||||
|
openh264-patch: $(OPENH264_SRC_DIR)/patch.stamp
|
||||||
|
|
||||||
|
openh264-install-headers:
|
||||||
|
mkdir -p $(OPENH264_SRC_DIR)/include/wels
|
||||||
|
rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/codec/api/svc/* $(OPENH264_SRC_DIR)/include/wels/.
|
||||||
|
|
||||||
|
copy-openh264-x86: openh264-patch openh264-install-headers
|
||||||
|
mkdir -p $(OPENH264_BUILD_DIR)
|
||||||
|
mkdir -p $(OPENH264_BUILD_DIR_X86)
|
||||||
|
cd $(OPENH264_BUILD_DIR_X86) \
|
||||||
|
&& rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* .
|
||||||
|
|
||||||
|
copy-openh264-arm: openh264-patch openh264-install-headers
|
||||||
|
mkdir -p $(OPENH264_BUILD_DIR)
|
||||||
|
mkdir -p $(OPENH264_BUILD_DIR_ARM)
|
||||||
|
cd $(OPENH264_BUILD_DIR_ARM) \
|
||||||
|
&& rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* .
|
||||||
|
|
||||||
|
build-openh264-x86: copy-openh264-x86
|
||||||
|
cd $(OPENH264_BUILD_DIR_X86) && \
|
||||||
|
make libraries -j$(NUMCPUS) OS=android ARCH=x86 NDKROOT=$(NDK_PATH) TARGET=$(NDKBUILD_TARGET)
|
||||||
|
|
||||||
|
build-openh264-arm: copy-openh264-arm
|
||||||
|
cd $(OPENH264_BUILD_DIR_ARM) && \
|
||||||
|
make libraries -j$(NUMCPUS) OS=android ARCH=arm NDKROOT=$(NDK_PATH) TARGET=$(NDKBUILD_TARGET)
|
||||||
|
|
||||||
|
build-openh264: $(BUILD_OPENH264_DEPS)
|
||||||
|
|
||||||
|
clean-openh264:
|
||||||
|
cd $(OPENH264_SRC_DIR) && git clean -dfx && git reset --hard
|
||||||
|
rm -rf $(OPENH264_BUILD_DIR_ARM)
|
||||||
|
rm -rf $(OPENH264_BUILD_DIR_X86)
|
||||||
|
|
||||||
#libvpx
|
#libvpx
|
||||||
|
ifeq ($(BUILD_VIDEO),1)
|
||||||
|
BUILD_VPX_DEPS=$(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt $(LIBVPX_BUILD_DIR)/arm/libvpx.a
|
||||||
|
ifeq ($(BUILD_FOR_X86), 1)
|
||||||
|
BUILD_VPX_DEPS+=$(LIBVPX_BUILD_DIR)/x86/libvpx.a
|
||||||
|
endif
|
||||||
|
endif
|
||||||
LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx
|
LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx
|
||||||
$(LIBVPX_SRC_DIR)/vp8/common/asm_com_offsets.c.S:
|
LIBVPX_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libvpx
|
||||||
cd $(LIBVPX_SRC_DIR) && \
|
LIBVPX_CONFIGURE_OPTIONS=--disable-vp9 --disable-examples --disable-unit-tests --disable-postproc --enable-error-concealment --enable-debug
|
||||||
./configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) --enable-error-concealment && \
|
|
||||||
make asm_com_offsets.asm \
|
|
||||||
|| ( echo "VP8 prepare stage failed." ; exit 1 )
|
|
||||||
|
|
||||||
prepare-vpx: $(LIBVPX_SRC_DIR)/vp8/common/asm_com_offsets.c.S
|
|
||||||
#SILK
|
|
||||||
LIBMSSILK_SRC_DIR=$(TOPDIR)/submodules/mssilk
|
|
||||||
LIBMSSILK_BUILD_DIR=$(LIBMSSILK_SRC_DIR)
|
|
||||||
$(LIBMSSILK_SRC_DIR)/configure:
|
|
||||||
cd $(LIBMSSILK_SRC_DIR) && ./autogen.sh
|
|
||||||
|
|
||||||
$(LIBMSSILK_BUILD_DIR)/Makefile: $(LIBMSSILK_SRC_DIR)/configure
|
$(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt:
|
||||||
cd $(LIBMSSILK_BUILD_DIR) && \
|
@patch -p1 < $(TOPDIR)/patches/libvpx_configure_android_x86.patch
|
||||||
$(LIBMSSILK_SRC_DIR)/configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" "
|
touch $@
|
||||||
|
|
||||||
#make sure to update this path if SILK sdk is changed
|
$(LIBVPX_BUILD_DIR)/arm/libvpx.a:
|
||||||
$(LIBMSSILK_BUILD_DIR)/sdk/SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8/src/SKP_Silk_resampler.c: $(LIBMSSILK_BUILD_DIR)/Makefile
|
mkdir -p $(LIBVPX_BUILD_DIR)/arm && \
|
||||||
cd $(LIBMSSILK_BUILD_DIR)/sdk && \
|
cd $(LIBVPX_BUILD_DIR)/arm && \
|
||||||
make extract-sources \
|
$(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \
|
||||||
|| ( echo "SILK audio plugin prepare state failed." ; exit 1 )
|
make -j${NUMCPUS} \
|
||||||
|
|| ( echo "Build of libvpx for arm failed." ; exit 1 )
|
||||||
|
|
||||||
prepare-silk: $(LIBMSSILK_BUILD_DIR)/sdk/SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8/src/SKP_Silk_resampler.c
|
$(LIBVPX_BUILD_DIR)/x86/libvpx.a:
|
||||||
|
mkdir -p $(LIBVPX_BUILD_DIR)/x86 && \
|
||||||
|
cd $(LIBVPX_BUILD_DIR)/x86 && \
|
||||||
|
$(LIBVPX_SRC_DIR)/configure --target=x86-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \
|
||||||
|
make -j${NUMCPUS} \
|
||||||
|
|| ( echo "Build of libvpx for x86 failed." ; exit 1 )
|
||||||
|
|
||||||
|
build-vpx: $(BUILD_VPX_DEPS)
|
||||||
|
|
||||||
|
clean-vpx:
|
||||||
|
cd $(LIBVPX_SRC_DIR) && git clean -dfx && git reset --hard
|
||||||
|
rm -rf submodules/externals/build/libvpx/arm && \
|
||||||
|
rm -rf submodules/externals/build/libvpx/x86
|
||||||
|
|
||||||
#Zrtp
|
|
||||||
$(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h : $(TOPDIR)/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h
|
|
||||||
@cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \
|
|
||||||
cp ../build/libzrtpcpp/libzrtpcpp-config.h . \
|
|
||||||
|| ( echo "ZRTP prepare state failed." ; exit 1 )
|
|
||||||
prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -91,6 +353,7 @@ $(TOPDIR)/submodules/externals/srtp/config.h : $(TOPDIR)/submodules/externals/bu
|
||||||
|
|
||||||
prepare-srtp: $(TOPDIR)/submodules/externals/srtp/config.h
|
prepare-srtp: $(TOPDIR)/submodules/externals/srtp/config.h
|
||||||
|
|
||||||
|
#ms2
|
||||||
prepare-mediastreamer2:
|
prepare-mediastreamer2:
|
||||||
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/src/ && \
|
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/src/ && \
|
||||||
eval `cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/\$$(abs_builddir)/./'` && \
|
eval `cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/\$$(abs_builddir)/./'` && \
|
||||||
|
|
@ -98,45 +361,169 @@ prepare-mediastreamer2:
|
||||||
if ! [ -e yuv2rgb.vs.h ]; then echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi && \
|
if ! [ -e yuv2rgb.vs.h ]; then echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi && \
|
||||||
if ! [ -e yuv2rgb.fs.h ]; then echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi
|
if ! [ -e yuv2rgb.fs.h ]; then echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi
|
||||||
|
|
||||||
prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-zrtp prepare-mediastreamer2
|
#antlr3
|
||||||
|
ANLTR3_SRC_DIR=$(TOPDIR)/submodules/externals/antlr3/runtime/C/include/
|
||||||
|
ANTLR3_BUILD_DIR=$(ANTLR3_SRC_DIR)
|
||||||
|
$(ANLTR3_SRC_DIR)/antlr3config.h: $(TOPDIR)/submodules/externals/build/antlr3/antlr3config.h
|
||||||
|
cp $(TOPDIR)/submodules/externals/build/antlr3/antlr3config.h $(ANLTR3_SRC_DIR)
|
||||||
|
prepare-antlr3: $(ANLTR3_SRC_DIR)/antlr3config.h
|
||||||
|
|
||||||
generate-libs:
|
%.tokens: %.g
|
||||||
$(NDK_PATH)/ndk-build $(NDK_BUILD_OPTIONS)
|
$(ANTLR) -make -fo $(dir $^) $^
|
||||||
|
|
||||||
update-project:
|
#Belle-sip
|
||||||
|
BELLESIP_SRC_DIR=$(TOPDIR)/submodules/belle-sip
|
||||||
|
BELLESIP_BUILD_DIR=$(BELLESIP_SRC_DIR)
|
||||||
|
prepare-belle-sip: $(BELLESIP_SRC_DIR)/src/grammars/belle_sip_message.tokens $(BELLESIP_SRC_DIR)/src/grammars/belle_sdp.tokens
|
||||||
|
|
||||||
|
#CUnit
|
||||||
|
prepare-cunit: $(TOPDIR)/submodules/externals/cunit/CUnit/Headers/*.h
|
||||||
|
[ -d $(TOPDIR)/submodules/externals/build/cunit/CUnit ] || mkdir $(TOPDIR)/submodules/externals/build/cunit/CUnit
|
||||||
|
cp $^ $(TOPDIR)/submodules/externals/build/cunit/CUnit
|
||||||
|
|
||||||
|
$(TOPDIR)/res/raw/rootca.pem:
|
||||||
|
HTTPS_CA_DIR=$(HTTPS_CA_DIR) $(TOPDIR)/submodules/linphone/scripts/mk-ca-bundle.pl $@
|
||||||
|
|
||||||
|
prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/tester_hosts $(TOPDIR)/res/raw/rootca.pem $(TOPDIR)/submodules/linphone/tester/messages.db
|
||||||
|
rm -rf liblinphone_tester/assets/config_files
|
||||||
|
mkdir -p liblinphone_tester/assets/config_files
|
||||||
|
for file in $^; do \
|
||||||
|
cp -rf $$file $(TOPDIR)/liblinphone_tester/assets/config_files/. \
|
||||||
|
;done
|
||||||
|
cp -rf $(TOPDIR)/submodules/linphone/tester/certificates $(TOPDIR)/liblinphone_tester/assets/config_files
|
||||||
|
cp -rf $(TOPDIR)/submodules/linphone/tester/sounds $(TOPDIR)/liblinphone_tester/assets/config_files
|
||||||
|
cp -rf $(TOPDIR)/submodules/linphone/tester/images $(TOPDIR)/liblinphone_tester/assets/config_files
|
||||||
|
cp -rf $(TOPDIR)/submodules/linphone/tester/rcfiles $(TOPDIR)/liblinphone_tester/assets/config_files
|
||||||
|
|
||||||
|
|
||||||
|
#Matroska2
|
||||||
|
MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska
|
||||||
|
MATROSKA_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libmatroska
|
||||||
|
ifeq ($(BUILD_MATROSKA), 1)
|
||||||
|
prepare-matroska2: $(MATROSKA_SRC_DIR)/patch_applied.txt
|
||||||
|
else
|
||||||
|
prepare-matroska2:
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(MATROSKA_SRC_DIR)/patch_applied.txt: $(MATROSKA_BUILD_DIR)/fix_libmatroska2.patch
|
||||||
|
cd $(MATROSKA_SRC_DIR); patch -p1 < $<; touch $@
|
||||||
|
|
||||||
|
#Build targets
|
||||||
|
prepare-sources: build-ffmpeg build-x264 build-openh264 prepare-ilbc build-vpx prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip $(TOPDIR)/res/raw/rootca.pem prepare-matroska2
|
||||||
|
|
||||||
|
GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
|
||||||
|
BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \
|
||||||
|
BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) BUILD_OPENH264=$(BUILD_OPENH264) ENABLE_OPENH264_DECODER=$(ENABLE_OPENH264_DECODER) BUILD_MATROSKA=$(BUILD_MATROSKA) \
|
||||||
|
BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) BUILD_ILBC=$(BUILD_ILBC) \
|
||||||
|
BUILD_FOR_ARM=$(BUILD_FOR_ARM) BUILD_NON_FREE_CODECS=$(BUILD_NON_FREE_CODECS)
|
||||||
|
|
||||||
|
|
||||||
|
LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
|
||||||
|
LIBLINPHONE_VERSION=$(LIBLINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \
|
||||||
|
BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) \
|
||||||
|
BUILD_CONTACT_HEADER=$(BUILD_CONTACT_HEADER) BUILD_RTP_MAP=$(BUILD_RTP_MAP) \
|
||||||
|
LIBLINPHONE_EXTENDED_SRC_FILES="$(LIBLINPHONE_EXTENDED_SRC_FILES)" \
|
||||||
|
LIBLINPHONE_EXTENDED_C_INCLUDES="$(LIBLINPHONE_EXTENDED_C_INCLUDES)" \
|
||||||
|
LIBLINPHONE_EXTENDED_CFLAGS="$(LIBLINPHONE_EXTENDED_CFLAGS)" \
|
||||||
|
APP_STL="$(APP_STL)" \
|
||||||
|
BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=$(BUILD_DONT_CHECK_HEADERS_IN_MESSAGE)
|
||||||
|
|
||||||
|
MEDIASTREAMER2_OPTIONS = $(GENERATE_OPTIONS) BUILD_MEDIASTREAMER2_SDK=1
|
||||||
|
|
||||||
|
|
||||||
|
generate-libs: prepare-sources javah
|
||||||
|
$(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=$(NDKBUILD_TARGET)
|
||||||
|
./bsed.sh # Fix path to libffmpeg library in linphone.so because of Android M Preview issue: https://code.google.com/p/android-developer-preview/issues/detail?id=2239
|
||||||
|
|
||||||
|
generate-mediastreamer2-libs: prepare-sources
|
||||||
|
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
|
||||||
|
$(NDK_PATH)/ndk-build $(MEDIASTREAMER2_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=$(NDKBUILD_TARGET)
|
||||||
|
|
||||||
|
update-project: $(TOPDIR)/res/raw/rootca.pem
|
||||||
|
$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
|
||||||
|
$(SDK_PATH)/android update test-project --path tests -m .
|
||||||
|
$(SDK_PATH)/android update project --path liblinphone_tester --target $(ANDROID_MOST_RECENT_TARGET)
|
||||||
|
|
||||||
|
update-mediastreamer2-project:
|
||||||
|
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
|
||||||
$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
|
$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
|
||||||
|
|
||||||
generate-apk:
|
liblinphone_tester: update-project prepare-sources prepare-cunit prepare-liblinphone_tester javah
|
||||||
ant partial-clean
|
$(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) TARGET_PLATFORM=$(NDKBUILD_TARGET)
|
||||||
|
$(MAKE) -C liblinphone_tester
|
||||||
|
|
||||||
|
javah:
|
||||||
|
$(ANT) javah
|
||||||
|
|
||||||
|
generate-apk: java-clean generate-libs
|
||||||
echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties
|
echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties
|
||||||
ant debug
|
$(ANT) debug
|
||||||
|
|
||||||
|
generate-mediastreamer2-apk: java-clean generate-mediastreamer2-libs
|
||||||
|
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
|
||||||
|
echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties && \
|
||||||
|
$(ANT) debug
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
adb uninstall $(PACKAGE_NAME)
|
||||||
|
|
||||||
install-apk:
|
install-apk:
|
||||||
ant installd
|
ant installd
|
||||||
|
|
||||||
release: update-project
|
release: update-project
|
||||||
ant clean
|
$(ANT) clean
|
||||||
echo "What is the version name for the release ?"; \
|
patch -p1 < release.patch
|
||||||
read version; \
|
cat ant.properties | grep version.name > default.properties
|
||||||
echo "version.name=$$version" > default.properties
|
$(ANT) release
|
||||||
ant release
|
patch -Rp1 < release.patch
|
||||||
|
|
||||||
run-linphone:
|
run-linphone:
|
||||||
ant run
|
ant run
|
||||||
|
|
||||||
run-tests:
|
run-liblinphone-tests: liblinphone_tester
|
||||||
ant partial-clean && \
|
$(MAKE) -C liblinphone_tester run-all-tests
|
||||||
$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test
|
|
||||||
$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone
|
|
||||||
@cd $(TOPDIR)/tests/ && \
|
|
||||||
$(SDK_PATH)/android update test-project --path . -m ../ && \
|
|
||||||
ant debug && \
|
|
||||||
ant installd && \
|
|
||||||
adb shell am instrument -w -e size small org.linphone.test/android.test.InstrumentationTestRunner
|
|
||||||
|
|
||||||
clean:
|
run-basic-tests: update-project
|
||||||
$(NDK_PATH)/ndk-build $(NDK_BUILD_OPTIONS) clean
|
$(ANT) partial-clean
|
||||||
ant clean
|
$(MAKE) -C tests run-basic-tests ANT_SILENT=$(ANT_SILENT)
|
||||||
|
|
||||||
.PHONY: clean
|
run-all-tests: update-project
|
||||||
|
$(ANT) partial-clean
|
||||||
|
$(MAKE) -C tests run-all-tests ANT_SILENT=$(ANT_SILENT)
|
||||||
|
|
||||||
|
clean-ndk-build:
|
||||||
|
- $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS)
|
||||||
|
$(ANT) clean
|
||||||
|
@if [ -f $(TOPDIR)/submodules/linphone/mediastreamer2/java/project.properties ]; then \
|
||||||
|
cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && $(ANT) clean; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
.NOTPARALLEL clean-native: clean-ndk-build clean-ffmpeg clean-x264 clean-openh264 clean-vpx
|
||||||
|
|
||||||
|
|
||||||
|
java-clean:
|
||||||
|
$(ANT) clean
|
||||||
|
|
||||||
|
clean: clean-native java-clean
|
||||||
|
|
||||||
|
veryclean: clean
|
||||||
|
|
||||||
|
.PHONY: clean install-apk run-linphone
|
||||||
|
|
||||||
|
generate-sdk: liblinphone-android-sdk
|
||||||
|
|
||||||
|
liblinphone-android-sdk: generate-apk
|
||||||
|
$(ANT) liblinphone-android-sdk
|
||||||
|
|
||||||
|
linphone-android-sdk: generate-apk
|
||||||
|
$(ANT) linphone-android-sdk
|
||||||
|
|
||||||
|
mediastreamer2-sdk: update-mediastreamer2-project generate-mediastreamer2-apk
|
||||||
|
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
|
||||||
|
$(ANT) mediastreamer2-sdk
|
||||||
|
|
||||||
|
pull-transifex:
|
||||||
|
tx pull -af
|
||||||
|
|
||||||
|
push-transifex:
|
||||||
|
tx push -s -t -f --no-interactive
|
||||||
|
|
|
||||||
150
README
150
README
|
|
@ -1,38 +1,146 @@
|
||||||
LINPHONE for ANDROID
|
****************************
|
||||||
****************************
|
* LINPHONE for ANDROID *
|
||||||
|
****************************
|
||||||
|
|
||||||
|
COMPILATION INSTRUCTIONS
|
||||||
|
************************
|
||||||
|
|
||||||
To build liblinphone for Android, you must:
|
To build liblinphone for Android, you must:
|
||||||
|
-------------------------------------------
|
||||||
0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path.
|
0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path.
|
||||||
1) download the Android ndk (>=r8b) from google and add it to your path.
|
1) download the Android ndk (=r10c) from google and add it to your path (no symlink !!!).
|
||||||
2) install the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig
|
2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig
|
||||||
2bis) on some 64 bits systems you'll need the ia32-libs package
|
On 64 bits linux systems you'll need the ia32-libs package
|
||||||
|
With the latest Debian (multiarch), you need this:
|
||||||
|
dpkg --add-architecture i386
|
||||||
|
aptitude update
|
||||||
|
aptitude install libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386
|
||||||
3) run the Makefile script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project.
|
3) run the Makefile script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project.
|
||||||
$ make
|
$ make
|
||||||
4) To install the generated apk into a plugged device, run
|
4) (Optional) To install the generated apk into a plugged device, run
|
||||||
$ make install
|
$ make install
|
||||||
|
5) (Optional) To generate a liblinphone SDK zip containing a full jar and native libraries, run
|
||||||
|
$ make liblinphone-android-sdk
|
||||||
|
6) (Optional) To generate a libmediastreamer2 SDK zip containing a full jar and native libraries, run
|
||||||
|
$ make mediastreamer2-sdk
|
||||||
|
7) (Optional) To generate a signed apk to publish on the Google Play, run
|
||||||
|
$ make release
|
||||||
|
Make sure you filled the ant.properties values for version.name, key.store and key.alias in order to correctly sign the generated apk.
|
||||||
|
You also may want to create a file name ant_password.properties with the following:
|
||||||
|
key.store.password=[your_password]
|
||||||
|
key.alias.password=[your_password]
|
||||||
|
If you don't, the passwords will be asked at the signing phase.
|
||||||
|
|
||||||
To run the tutorials:
|
To run the tutorials:
|
||||||
|
--------------------
|
||||||
1) open the res/values/non_localizable_custom.xml file and change the value of the show_tutorials_instead_of_app to true.
|
1) open the res/values/non_localizable_custom.xml file and change the value of the show_tutorials_instead_of_app to true.
|
||||||
2) compile again using make && make install.
|
2) compile again using make && make install.
|
||||||
3) /!\ don't forget to put it back to false to run the linphone application normally. /!\
|
3) /!\ don't forget to put it back to false to run the linphone application normally. /!\
|
||||||
|
|
||||||
To create an apk with a different package name, you need to edit the custom_rules.xml file:
|
To create an apk with a different package name
|
||||||
|
----------------------------------------------
|
||||||
|
You need to edit the custom_rules.xml file:
|
||||||
1) look for the property named "linphone.package.name" and change it value accordingly
|
1) look for the property named "linphone.package.name" and change it value accordingly
|
||||||
2) run again the Makefile script by calling "make"
|
2) also update the values in the AndroidManifest file where the comment <!-- Change package ! --> appears
|
||||||
|
3) update the path to the sounds in the linphonerc-factory files in the res folders and optionally change default sip account on linphonerc-default
|
||||||
|
4) run again the Makefile script by calling "make"
|
||||||
|
|
||||||
|
To run the liblinphone test suite on android
|
||||||
|
--------------------------------------------
|
||||||
|
Simply run
|
||||||
|
$ make liblinphone_tester
|
||||||
|
This will be build everything, generate an apk, and install it on the connected device if any.
|
||||||
|
|
||||||
|
You can speed up the compilation by using ccache (compiler cache, see https://ccache.samba.org/). Simply export:
|
||||||
|
export NDK_CCACHE=ccache
|
||||||
|
|
||||||
|
TROUBLESHOOTING
|
||||||
|
***************
|
||||||
|
If you encounter the following issue:
|
||||||
|
E/dalvikvm( 2465): dlopen("/data/app-lib/org.linphone-1/liblinphone-armeabi-v7a.so") failed: Cannot load library: soinfo_relocate(linker.cpp:975): cannot locate symbol "rand" referenced by "liblinphone-armeabi-v7a.so"...
|
||||||
|
it's because you have installed the android-21 platform (which is chosen automatically because it's the most recent) and you deployed the apk on a android < 5 device.
|
||||||
|
To fix this, in the Makefile, force ANDROID_MOST_RECENT_TARGET=android-19
|
||||||
|
|
||||||
|
If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU
|
||||||
|
|
||||||
|
If you built the app using eclipse, ensure you ran at least once the make command (see above steps 0 to 3) ! Else you'll have this exceptions:
|
||||||
|
FATAL EXCEPTION: main
|
||||||
|
java.lang.ExceptionInInitializerError
|
||||||
|
...
|
||||||
|
Caused by: java.lang.UnsatisfiedLinkError: Couldn't load linphone-armeabi-v7a: findLibrary returned null
|
||||||
|
...
|
||||||
|
|
||||||
|
BUILD OPTIONS
|
||||||
|
*************
|
||||||
|
|
||||||
Some options can be passed to make, like "make SOME_OPTION=SOME_VALUE".
|
Some options can be passed to make, like "make SOME_OPTION=SOME_VALUE".
|
||||||
|
|
||||||
Option Name | Possible values | Default value
|
ENABLE_GPL_THIRD_PARTIES
|
||||||
-------------------------------------------------------------------------------------------------------------------------------------------------------
|
values: 0 (GPL third parties disabled) or 1 (GPL third parties enabled), default value: 1
|
||||||
BUILD_X264 0 (don't build x264) or 1 (build x264) | 0
|
GPL third parties are: X264 and G729
|
||||||
BUILD_AMRNB 0 (don't build amrnb codec), light (try to use amrnb codec from android), full (build your own amrnb codec) | full
|
|
||||||
BUILD_AMRWB 0 (don't build amrwb codec), 1 (build your own amrwb codec) | 0
|
|
||||||
BUILD_GPLV3_ZRTP 0 (don't support ZRTP), 1 (support ZRTP and make the whole program GPLv3) | 0
|
|
||||||
BUILD_SILK 0 (don't build silk plugin), 1 (build silk) [silk is Skype nonfree patented audio codec] | 1
|
|
||||||
BUILD_G729 0 (don't build g729 plugin), 1 (build g729) [g729 is nonfree patented audio codec, contact Sipro lab for more details] | 0
|
|
||||||
BUILD_TUNNEL 0 (don't build tunnel), 1 (build tunnel) [requires a tunnel implementation in submodules/linphone/tunnel] | 0
|
|
||||||
BUILD_WEBRTC_AECM 0 (don't build echo canceler), 1 (build echo canceler) | 1
|
|
||||||
USE_JAVAH 0 (don't generate header), 1 (generate header for linphone_core_jni) [used to check errors at liblinphone compilation] | 1
|
|
||||||
BUILD_FOR_X86 0 (don't generate liblinphone libraries for x86 architecture), 1 (build liblinphone libraries for x86 architecture) | 1
|
|
||||||
|
|
||||||
If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU
|
BUILD_VIDEO
|
||||||
|
values: 0 (no video) or 1 (video enabled), default value: 1
|
||||||
|
|
||||||
|
BUILD_OPENH264
|
||||||
|
values: 0 (don't build openH264) or 1 (build openH264), default value: 1
|
||||||
|
|
||||||
|
ENABLE_OPENH264_DECODER
|
||||||
|
values: 0 (disable openh264 decoder) or 1 (enable openh264 decoder), default value: 1
|
||||||
|
|
||||||
|
BUILD_X264
|
||||||
|
values: 0 (don't build x264) or 1 (build x264), default value: 0
|
||||||
|
|
||||||
|
BUILD_AMRNB
|
||||||
|
values: 0 (don't build amrnb codec), light (try to use amrnb codec from android), full (build your own amrnb codec), default value: full
|
||||||
|
|
||||||
|
BUILD_AMRWB
|
||||||
|
values: 0 (don't build amrwb codec), 1 (build your own amrwb codec): default value: 1
|
||||||
|
|
||||||
|
BUILD_ZRTP
|
||||||
|
values: 0 (don't support ZRTP), 1 (support ZRTP), default value: 1
|
||||||
|
|
||||||
|
BUILD_SILK
|
||||||
|
values: 0 (don't build silk plugin), 1 (build silk) [silk is Skype nonfree patented audio codec], default value: 1
|
||||||
|
|
||||||
|
BUILD_G729
|
||||||
|
values: 0 (don't build g729 plugin), 1 (build g729) [g729 is nonfree patented audio codec, contact Sipro lab for more details]
|
||||||
|
default value: 1
|
||||||
|
|
||||||
|
BUILD_TUNNEL
|
||||||
|
values: 0 (don't build tunnel), 1 (build tunnel) [requires a non-free tunnel implementation in submodules/linphone/tunnel]
|
||||||
|
default value: 0
|
||||||
|
|
||||||
|
BUILD_WEBRTC_AECM
|
||||||
|
values: 0 (don't build echo canceler), 1 (build echo canceler)
|
||||||
|
default value: 1
|
||||||
|
|
||||||
|
USE_JAVAH
|
||||||
|
values: 0 (don't generate header), 1 (generate header for linphone_core_jni) [used to check errors at liblinphone compilation]
|
||||||
|
default value: 1
|
||||||
|
|
||||||
|
BUILD_FOR_X86
|
||||||
|
values: 0 (don't generate liblinphone libraries for x86 architecture), 1 (build liblinphone libraries for x86 architecture)
|
||||||
|
default value: 1
|
||||||
|
|
||||||
|
BUILD_SQLITE
|
||||||
|
values: 0 (don't build sqlite3), 1 (build sqlite3) [used to store chat messages inside liblinphone]
|
||||||
|
default value: 1
|
||||||
|
|
||||||
|
BUILD_TLS
|
||||||
|
values: 0 (don't build tls), 1 (do build tls), default value: 1
|
||||||
|
|
||||||
|
BUILD_WEBRTC_ISAC
|
||||||
|
values: 0 (don't build isac), 1 (do build isac), default value: 1
|
||||||
|
|
||||||
|
BUILD_OPUS
|
||||||
|
values: 0 (don't build opus), 1 (do build opus), default value: 1
|
||||||
|
|
||||||
|
BUILD_UPNP
|
||||||
|
values: 0 (don't build upnp), 1 (do build upnp), default value: 1
|
||||||
|
|
||||||
|
BUILD_MATROSKA
|
||||||
|
values: 0 (don't build matroska and ebml), 1 (do build matroska and ebml), default value: 0
|
||||||
|
|
||||||
|
BUILD_ILBC
|
||||||
|
values: 0 (don't build iLBC), 1 (do build iLBC), default value: 1
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
source.dir=src:submodules/linphone/mediastreamer2/java/src:submodules/linphone/java/j2se:submodules/linphone/java/common:submodules/linphone/java/impl:submodules/linphone/coreapi/help/java:submodules/externals/axmlrpc/src/main/java
|
source.dir=src:submodules/linphone/mediastreamer2/java/src:submodules/linphone/java/j2se:submodules/linphone/java/common:submodules/linphone/java/impl:submodules/linphone/coreapi/help/java:submodules/externals/axmlrpc/src/main/java
|
||||||
key.store=bc-android.keystore
|
key.store=bc-android.keystore
|
||||||
key.alias=nw8000
|
key.alias=nw8000
|
||||||
|
version.name=2.4.0
|
||||||
|
|
|
||||||
48
bsed.sh
Executable file
48
bsed.sh
Executable file
|
|
@ -0,0 +1,48 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Script found at http://everydaywithlinux.blogspot.fr/2012/11/patch-strings-in-binary-files-with-sed.html
|
||||||
|
|
||||||
|
function patch_strings_in_file() {
|
||||||
|
local FILE="$1"
|
||||||
|
local PATTERN="$2"
|
||||||
|
local REPLACEMENT="$3"
|
||||||
|
|
||||||
|
# Find all unique strings in FILE that contain the pattern
|
||||||
|
STRINGS=$(strings ${FILE} | grep ${PATTERN} | sort -u -r)
|
||||||
|
|
||||||
|
if [ "${STRINGS}" != "" ] ; then
|
||||||
|
echo "File '${FILE}' contain strings with '${PATTERN}' in them:"
|
||||||
|
|
||||||
|
for OLD_STRING in ${STRINGS} ; do
|
||||||
|
# Create the new string with a simple bash-replacement
|
||||||
|
NEW_STRING=${OLD_STRING//${PATTERN}/${REPLACEMENT}}
|
||||||
|
|
||||||
|
# Create null terminated ASCII HEX representations of the strings
|
||||||
|
OLD_STRING_HEX="$(echo -n ${OLD_STRING} | xxd -g 0 -u -ps -c 256)00"
|
||||||
|
NEW_STRING_HEX="$(echo -n ${NEW_STRING} | xxd -g 0 -u -ps -c 256)00"
|
||||||
|
|
||||||
|
if [ ${#NEW_STRING_HEX} -le ${#OLD_STRING_HEX} ] ; then
|
||||||
|
# Pad the replacement string with null terminations so the
|
||||||
|
# length matches the original string
|
||||||
|
while [ ${#NEW_STRING_HEX} -lt ${#OLD_STRING_HEX} ] ; do
|
||||||
|
NEW_STRING_HEX="${NEW_STRING_HEX}00"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Now, replace every occurrence of OLD_STRING with NEW_STRING
|
||||||
|
echo -n "Replacing ${OLD_STRING} with ${NEW_STRING}... "
|
||||||
|
hexdump -ve '1/1 "%.2X"' ${FILE} | \
|
||||||
|
sed "s/${OLD_STRING_HEX}/${NEW_STRING_HEX}/g" | \
|
||||||
|
xxd -r -p > ${FILE}.tmp
|
||||||
|
chmod --reference ${FILE} ${FILE}.tmp
|
||||||
|
mv ${FILE}.tmp ${FILE}
|
||||||
|
echo "Done!"
|
||||||
|
else
|
||||||
|
echo "New string '${NEW_STRING}' is longer than old" \
|
||||||
|
"string '${OLD_STRING}'. Skipping."
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
patch_strings_in_file libs/armeabi-v7a/liblinphone-armeabi-v7a.so "./obj/local/armeabi-v7a/libffmpeg-linphone-arm.so" "libffmpeg-linphone-arm.so"
|
||||||
|
patch_strings_in_file libs/x86/liblinphone-x86.so "./obj/local/x86/libffmpeg-linphone-x86.so" "libffmpeg-linphone-x86.so"
|
||||||
45
build.gradle
Normal file
45
build.gradle
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.android.tools.build:gradle:1.0.0'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
apply plugin: 'android'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile fileTree(dir: 'libs', include: '*.jar')
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
compileSdkVersion 22
|
||||||
|
buildToolsVersion "20.0.0"
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
main {
|
||||||
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
|
java.srcDirs = ['submodules/linphone/mediastreamer2/java/src','submodules/linphone/java/j2se','submodules/linphone/java/common','submodules/linphone/java/impl','submodules/externals/axmlrpc/src/main/java','submodules/linphone/coreapi/help/java','src']
|
||||||
|
resources.srcDirs = ['submodules/linphone/mediastreamer2/java/src','submodules/linphone/java/j2se','submodules/linphone/java/common','submodules/linphone/java/impl','submodules/externals/axmlrpc/src/main/java','submodules/linphone/coreapi/help/java','src']
|
||||||
|
aidl.srcDirs = ['submodules/linphone/mediastreamer2/java/src','submodules/linphone/java/j2se','submodules/linphone/java/common','submodules/linphone/java/impl','submodules/externals/axmlrpc/src/main/java','submodules/linphone/coreapi/help/java','src']
|
||||||
|
renderscript.srcDirs = ['submodules/linphone/mediastreamer2/java/src','submodules/linphone/java/j2se','submodules/linphone/java/common','submodules/linphone/java/impl','submodules/externals/axmlrpc/src/main/java','submodules/linphone/coreapi/help/java','src']
|
||||||
|
res.srcDirs = ['res']
|
||||||
|
assets.srcDirs = ['assets']
|
||||||
|
jniLibs.srcDir 'libs'
|
||||||
|
|
||||||
|
java.exclude '**/mediastream/MediastreamerActivity.java'
|
||||||
|
}
|
||||||
|
|
||||||
|
// Move the tests to tests/java, tests/res, etc...
|
||||||
|
instrumentTest.setRoot('tests')
|
||||||
|
|
||||||
|
// Move the build types to build-types/<type>
|
||||||
|
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
|
||||||
|
// This moves them out of them default location under src/<type>/... which would
|
||||||
|
// conflict with src/ being used by the main source set.
|
||||||
|
// Adding new build types or product flavors should be accompanied
|
||||||
|
// by a similar customization.
|
||||||
|
debug.setRoot('build-types/debug')
|
||||||
|
release.setRoot('build-types/release')
|
||||||
|
}
|
||||||
|
}
|
||||||
22
build.xml
22
build.xml
|
|
@ -26,8 +26,9 @@
|
||||||
application and should be checked into Version Control Systems.
|
application and should be checked into Version Control Systems.
|
||||||
|
|
||||||
-->
|
-->
|
||||||
<property file="ant.properties" />
|
|
||||||
<property file="default.properties" />
|
<property file="default.properties" />
|
||||||
|
<property file="ant.properties" />
|
||||||
|
<property file="ant_password.properties" />
|
||||||
|
|
||||||
<!-- if sdk.dir was not set from one of the property file, then
|
<!-- if sdk.dir was not set from one of the property file, then
|
||||||
get it from the ANDROID_HOME env var.
|
get it from the ANDROID_HOME env var.
|
||||||
|
|
@ -87,7 +88,22 @@
|
||||||
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
||||||
in order to avoid having your file be overridden by tools such as "android update project"
|
in order to avoid having your file be overridden by tools such as "android update project"
|
||||||
-->
|
-->
|
||||||
<!-- version-tag: custom -->
|
<path id="android.antlibs">
|
||||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
<pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
|
||||||
|
</path>
|
||||||
|
|
||||||
|
<!-- Custom tasks -->
|
||||||
|
<taskdef resource="anttasks.properties" classpathref="android.antlibs" />
|
||||||
|
<property name="exe" value="" />
|
||||||
|
<property name="bat" value="" />
|
||||||
|
|
||||||
|
<getbuildtools name="android.build.tools.dir" verbose="${verbose}" />
|
||||||
|
<property name="aidl" location="${android.build.tools.dir}/aidl${exe}" />
|
||||||
|
<property name="aapt" location="${android.build.tools.dir}/aapt${exe}" />
|
||||||
|
<property name="dx" location="${android.build.tools.dir}/dx${bat}" />
|
||||||
|
<property name="zipalign" location="${android.build.tools.dir}/zipalign${exe}" />
|
||||||
|
|
||||||
|
<!-- version-tag: custom -->
|
||||||
|
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
51
check_tools.sh
Executable file
51
check_tools.sh
Executable file
|
|
@ -0,0 +1,51 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
error_on_quit=0
|
||||||
|
|
||||||
|
echo_err() {
|
||||||
|
echo "$@" >&2
|
||||||
|
error_on_quit=1
|
||||||
|
}
|
||||||
|
|
||||||
|
check_installed() {
|
||||||
|
if [ -z "$(which $1)" ]; then
|
||||||
|
echo_err "Could not find $1. Please install $2."
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
for prog in automake autoconf pkg-config java ant yasm nasm wget; do
|
||||||
|
check_installed "$prog" "it"
|
||||||
|
done
|
||||||
|
check_installed "libtoolize" "libtool"
|
||||||
|
check_installed "ndk-build" "android NDK"
|
||||||
|
if check_installed "android" "android SDK"; then
|
||||||
|
check_installed "adb" "android SDK platform tools"
|
||||||
|
# check that at least one target is installed
|
||||||
|
if [ -z "$(android list target -c)" ]; then
|
||||||
|
echo_err "Install at least one android target in the android SDK"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if nasm -f elf32 2>&1 | grep -q "fatal: unrecognised output format"; then
|
||||||
|
echo_err "Invalid version of nasm: your version does not support elf32 output format. If you have installed nasm, please check that your PATH env variable is set correctly."
|
||||||
|
fi
|
||||||
|
if ! (find submodules/linphone/mediastreamer2 -mindepth 1 2>/dev/null | grep -q . \
|
||||||
|
|| find submodules/linphone/oRTP -mindepth 1 2>/dev/null | grep -q .); then
|
||||||
|
echo_err "Missing some git submodules. Did you run 'git submodule update --init --recursive'?"
|
||||||
|
fi
|
||||||
|
# Android NDK should NOT be simlinked!
|
||||||
|
if [ -L "$ANDROID_NDK" ] && [ -d "$ANDROID_NDK" ]; then
|
||||||
|
echo_err "ANDROID_NDK=$ANDROID_NDK must NOT be a symbolic link, please modify it accordingly"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $error_on_quit = 0 ]; then
|
||||||
|
rm -f check_tools.mk
|
||||||
|
touch check_tools.mk
|
||||||
|
echo "JAVA=\"$(which java)\"" >> check_tools.mk
|
||||||
|
echo "ANTLR=\"$(which java)\" -jar \"submodules/externals/antlr3/antlr-3.2.jar\"" >> check_tools.mk
|
||||||
|
else
|
||||||
|
echo "Failed to detect required tools, aborting."
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit $error_on_quit
|
||||||
|
|
@ -3,21 +3,12 @@
|
||||||
<property name="linphone.package.name" value="org.linphone" />
|
<property name="linphone.package.name" value="org.linphone" />
|
||||||
|
|
||||||
<target name="-pre-build" description="Move file that is not to be compiled.">
|
<target name="-pre-build" description="Move file that is not to be compiled.">
|
||||||
<move file="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java"
|
|
||||||
tofile="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.wnin"
|
|
||||||
failonerror="false" />
|
|
||||||
<copy file="submodules/linphone/share/xml/lpconfig.xsd"
|
<copy file="submodules/linphone/share/xml/lpconfig.xsd"
|
||||||
tofile="res/raw/lpconfig.xsd"
|
tofile="res/raw/lpconfig.xsd"
|
||||||
failonerror="false" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-post-build" description="Restore file that has been moved so that it was not compiled.">
|
|
||||||
<move file="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.wnin"
|
|
||||||
tofile="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java"
|
|
||||||
failonerror="false" />
|
failonerror="false" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="javah">
|
<target name="javah" depends="-set-debug-mode,-compile">
|
||||||
<echo level="info">Generate JNI header</echo>
|
<echo level="info">Generate JNI header</echo>
|
||||||
<javah outputfile="gen/linphonecore_jni.h">
|
<javah outputfile="gen/linphonecore_jni.h">
|
||||||
<classpath>
|
<classpath>
|
||||||
|
|
@ -37,6 +28,14 @@
|
||||||
<class name="org.linphone.core.LinphoneProxyConfigImpl" />
|
<class name="org.linphone.core.LinphoneProxyConfigImpl" />
|
||||||
<class name="org.linphone.core.PayloadTypeImpl" />
|
<class name="org.linphone.core.PayloadTypeImpl" />
|
||||||
<class name="org.linphone.core.LpConfigImpl" />
|
<class name="org.linphone.core.LpConfigImpl" />
|
||||||
|
<class name="org.linphone.core.LinphoneInfoMessageImpl" />
|
||||||
|
<class name="org.linphone.core.LinphoneEventImpl" />
|
||||||
|
<class name="org.linphone.core.PresenceActivityImpl" />
|
||||||
|
<class name="org.linphone.core.PresenceModelImpl" />
|
||||||
|
<class name="org.linphone.core.PresenceNoteImpl" />
|
||||||
|
<class name="org.linphone.core.PresencePersonImpl" />
|
||||||
|
<class name="org.linphone.core.PresenceServiceImpl" />
|
||||||
|
<class name="org.linphone.core.ErrorInfoImpl" />
|
||||||
</javah>
|
</javah>
|
||||||
<javah outputfile="gen/xml2lpc_jni.h">
|
<javah outputfile="gen/xml2lpc_jni.h">
|
||||||
<classpath>
|
<classpath>
|
||||||
|
|
@ -51,34 +50,25 @@
|
||||||
<class name="org.linphone.tools.Lpc2Xml" />
|
<class name="org.linphone.tools.Lpc2Xml" />
|
||||||
</javah>
|
</javah>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="partial-clean">
|
<target name="partial-clean">
|
||||||
<delete file="bin/${ant.project.name}.ap_" />
|
<delete file="bin/${ant.project.name}.ap_" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="build-libs">
|
|
||||||
<exec executable="make" failonerror="true">
|
|
||||||
<arg value="generate-libs" />
|
|
||||||
</exec>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="-post-compile" depends="javah, build-libs">
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="javadoc">
|
<target name="javadoc">
|
||||||
<echo level="info">Generate Javadoc</echo>
|
<echo level="info">Generate Javadoc</echo>
|
||||||
<javadoc
|
<javadoc
|
||||||
destdir="${javadoc.dir}"
|
destdir="${javadoc.dir}"
|
||||||
verbose="off"
|
verbose="off"
|
||||||
use="true"
|
use="true"
|
||||||
classpath="${sdk.dir}/platforms/${target}/android.jar:libs/android-support-v4.jar:libs/gcm.jar"
|
classpath="${sdk.dir}/platforms/${target}/android.jar:libs/android-support-v4.jar:libs/gcm.jar"
|
||||||
sourcepath="${source.dir}:gen"
|
sourcepath="${source.dir}:gen"
|
||||||
linkoffline="http://developer.android.com/reference file:/${sdk.dir}/docs/reference"
|
linkoffline="http://developer.android.com/reference file:/${sdk.dir}/docs/reference"
|
||||||
stylesheetfile="${sdk.dir}/docs/assets/android-developer-docs.css">
|
stylesheetfile="${sdk.dir}/docs/assets/android-developer-docs.css">
|
||||||
</javadoc>
|
</javadoc>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="-package-resources" depends="-crunch">
|
<target name="-package-resources" depends="-crunch">
|
||||||
<!-- only package resources if *not* a library project -->
|
<!-- only package resources if *not* a library project -->
|
||||||
<do-only-if-not-library elseText="Library project: do not package resources...">
|
<do-only-if-not-library elseText="Library project: do not package resources...">
|
||||||
<exec executable="${aapt}" failonerror="true">
|
<exec executable="${aapt}" failonerror="true">
|
||||||
|
|
@ -106,7 +96,7 @@
|
||||||
<arg value="${linphone.package.name}" />
|
<arg value="${linphone.package.name}" />
|
||||||
<arg value="--custom-package" />
|
<arg value="--custom-package" />
|
||||||
<arg value="${linphone.package.name}" />
|
<arg value="${linphone.package.name}" />
|
||||||
</exec>
|
</exec>
|
||||||
</do-only-if-not-library>
|
</do-only-if-not-library>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
@ -121,4 +111,39 @@
|
||||||
<arg value="${linphone.package.name}/org.linphone.LinphoneLauncherActivity" />
|
<arg value="${linphone.package.name}/org.linphone.LinphoneLauncherActivity" />
|
||||||
</exec>
|
</exec>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
<target name="liblinphone-android-sdk">
|
||||||
|
<echo level="info">Creating library output jar file...</echo>
|
||||||
|
<property name="out.library.jar.file" location="${out.absolute.dir}/liblinphone.jar" />
|
||||||
|
<jar destfile="${out.library.jar.file}">
|
||||||
|
<fileset dir="${out.classes.absolute.dir}"
|
||||||
|
includes="org/linphone/mediastream/**/*.class org/linphone/core/**/*.class"/>
|
||||||
|
<fileset dir="submodules/linphone/java" >
|
||||||
|
<include name="common/org/linphone/core/*.java"/>
|
||||||
|
<include name="j2se/org/linphone/core/*.java"/>
|
||||||
|
</fileset>
|
||||||
|
</jar>
|
||||||
|
<zip destfile="liblinphone-android-sdk-${version.name}.zip">
|
||||||
|
<zipfileset dir="libs" prefix="libs" includes="**/*.so" />
|
||||||
|
<zipfileset dir="${out.absolute.dir}" includes="liblinphone.jar" prefix="libs"/>
|
||||||
|
</zip>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="linphone-android-sdk">
|
||||||
|
<echo level="info">Creating library output jar file...</echo>
|
||||||
|
<property name="out.library.jar.file" location="${out.absolute.dir}/linphone.jar" />
|
||||||
|
<jar destfile="${out.library.jar.file}">
|
||||||
|
<fileset dir="${out.classes.absolute.dir}"
|
||||||
|
includes="org/linphone/mediastream/**/*.class org/linphone/core/**/*.class org/linphone/**/*.class"/>
|
||||||
|
<fileset dir="submodules/linphone/java" >
|
||||||
|
<include name="common/org/linphone/core/*.java"/>
|
||||||
|
<include name="j2se/org/linphone/core/*.java"/>
|
||||||
|
</fileset>
|
||||||
|
</jar>
|
||||||
|
<zip destfile="linphone-android-sdk-${version.name}.zip">
|
||||||
|
<zipfileset dir="libs" prefix="libs" includes="**/*.so" />
|
||||||
|
<zipfileset dir="${out.absolute.dir}" includes="linphone.jar" prefix="libs"/>
|
||||||
|
</zip>
|
||||||
|
</target>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
6
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
6
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
#Tue Dec 09 14:35:04 CET 2014
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
|
||||||
145
jni/Android.mk
145
jni/Android.mk
|
|
@ -1,31 +1,31 @@
|
||||||
# script expect linphone-root-dir variable to be set by parent !
|
# script expect linphone-root-dir variable to be set by parent !
|
||||||
|
|
||||||
#default values
|
#enable video on armv7 and x86 targets only
|
||||||
ifeq ($(BUILD_AMRNB),)
|
#since we want to modify BUILD_VIDEO and BUILD_X264 depending on platform, we need to make a copy because the
|
||||||
BUILD_AMRNB=light
|
#variables given on command line take precedence over the ones defined internally.
|
||||||
endif
|
ifeq ($(TARGET_ARCH_ABI), armeabi)
|
||||||
ifeq ($(BUILD_AMRWB),)
|
_BUILD_X264=0
|
||||||
BUILD_AMRWB=0
|
_BUILD_OPENH264=0
|
||||||
endif
|
_BUILD_VIDEO=0
|
||||||
ifeq ($(BUILD_G729),)
|
else
|
||||||
BUILD_G729=0
|
_BUILD_X264=$(BUILD_X264)
|
||||||
endif
|
_BUILD_OPENH264=$(BUILD_OPENH264)
|
||||||
BUILD_SRTP=1
|
_BUILD_VIDEO=$(BUILD_VIDEO)
|
||||||
|
|
||||||
BUILD_X264=0
|
|
||||||
LINPHONE_VIDEO=0
|
|
||||||
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
|
|
||||||
BUILD_X264=1
|
|
||||||
LINPHONE_VIDEO=1
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(linphone-root-dir)/submodules/linphone/mediastreamer2/src/android/libneon/Android.mk
|
ifeq ($(_BUILD_VIDEO),0)
|
||||||
|
ifeq (,$(DUMP_VAR))
|
||||||
|
$(info $(TARGET_ARCH_ABI): Video is disabled for targets other than armeabi-v7a and x86)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
##ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
|
#libxml2
|
||||||
ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
include $(linphone-root-dir)/submodules/externals/build/libxml2/Android.mk
|
||||||
|
|
||||||
|
ifeq ($(BUILD_ZRTP), 1)
|
||||||
BUILD_SRTP=1
|
BUILD_SRTP=1
|
||||||
ZRTP_C_INCLUDE= \
|
ZRTP_C_INCLUDE= \
|
||||||
$(linphone-root-dir)/submodules/externals/libzrtpcpp/src
|
$(linphone-root-dir)/submodules/bzrtp/include
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_SRTP), 1)
|
ifeq ($(BUILD_SRTP), 1)
|
||||||
|
|
@ -34,32 +34,35 @@ SRTP_C_INCLUDE= \
|
||||||
$(linphone-root-dir)/submodules/externals/srtp/include \
|
$(linphone-root-dir)/submodules/externals/srtp/include \
|
||||||
$(linphone-root-dir)/submodules/externals/srtp/crypto/include
|
$(linphone-root-dir)/submodules/externals/srtp/crypto/include
|
||||||
endif
|
endif
|
||||||
#endif
|
|
||||||
|
|
||||||
|
#sqlite
|
||||||
|
ifeq ($(BUILD_SQLITE),1)
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/sqlite/Android.mk
|
||||||
|
endif
|
||||||
|
|
||||||
#libupnp
|
#libupnp
|
||||||
ifeq ($(BUILD_UPNP),1)
|
ifeq ($(BUILD_UPNP),1)
|
||||||
include $(linphone-root-dir)/submodules/externals/build/libupnp/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/libupnp/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#libxml2 + xml2lpc + lpc2xml
|
|
||||||
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
|
|
||||||
include $(linphone-root-dir)/submodules/externals/build/libxml2/Android.mk
|
|
||||||
include $(linphone-root-dir)/submodules/linphone/build/android/xml2lpc.mk
|
|
||||||
include $(linphone-root-dir)/submodules/linphone/build/android/lpc2xml.mk
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Speex
|
# Speex
|
||||||
include $(linphone-root-dir)/submodules/externals/build/speex/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/speex/Android.mk
|
||||||
|
|
||||||
# Gsm
|
# Gsm
|
||||||
include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk
|
||||||
|
|
||||||
include $(linphone-root-dir)/submodules/externals/build/exosip/Android.mk
|
# Matroska
|
||||||
|
ifeq ($(BUILD_MATROSKA), 1)
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/libmatroska/Android.mk
|
||||||
|
endif
|
||||||
|
|
||||||
include $(linphone-root-dir)/submodules/externals/build/osip/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk
|
||||||
|
ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/antlr3/Android.mk
|
||||||
|
include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk
|
||||||
|
endif
|
||||||
|
|
||||||
# Openssl
|
|
||||||
include $(linphone-root-dir)/submodules/externals/openssl/Android.mk
|
|
||||||
|
|
||||||
include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk
|
include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk
|
||||||
|
|
||||||
|
|
@ -67,51 +70,59 @@ include $(linphone-root-dir)/submodules/linphone/mediastreamer2/build/android/An
|
||||||
include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk
|
include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk
|
||||||
|
|
||||||
|
|
||||||
|
#tunnel
|
||||||
ifeq ($(BUILD_TUNNEL), 1)
|
ifeq ($(BUILD_TUNNEL), 1)
|
||||||
include $(linphone-root-dir)/submodules/tunnel/Android.mk
|
include $(linphone-root-dir)/submodules/tunnel/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_SILK), 1)
|
ifeq ($(BUILD_SILK), 1)
|
||||||
ifeq (,$(DUMP_VAR))
|
ifeq (,$(DUMP_VAR))
|
||||||
$(info Build proprietary SILK plugin for mediastreamer2)
|
$(info $(TARGET_ARCH_ABI): Build proprietary SILK plugin for mediastreamer2)
|
||||||
endif
|
endif
|
||||||
include $(linphone-root-dir)/submodules/mssilk/Android.mk
|
include $(linphone-root-dir)/submodules/mssilk/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_ILBC), 1)
|
||||||
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
|
|
||||||
include $(linphone-root-dir)/submodules/msilbc/Android.mk
|
include $(linphone-root-dir)/submodules/msilbc/Android.mk
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_X264), 1)
|
ifeq ($(_BUILD_VIDEO),1)
|
||||||
|
|
||||||
|
ifeq ($(_BUILD_X264),1)
|
||||||
ifeq (,$(DUMP_VAR))
|
ifeq (,$(DUMP_VAR))
|
||||||
$(info Build X264 plugin for mediastreamer2)
|
$(info $(TARGET_ARCH_ABI): Build X264 plugin for mediastreamer2)
|
||||||
endif
|
endif
|
||||||
include $(linphone-root-dir)/submodules/msx264/Android.mk
|
include $(linphone-root-dir)/submodules/msx264/Android.mk
|
||||||
include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk
|
ifeq ($(_BUILD_OPENH264),1)
|
||||||
include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android.mk
|
|
||||||
|
|
||||||
include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
|
|
||||||
endif #armeabi-v7a
|
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
|
||||||
ifeq (,$(DUMP_VAR))
|
ifeq (,$(DUMP_VAR))
|
||||||
$(info Build ZRTP support - makes application GPLv3)
|
$(info $(TARGET_ARCH_ABI): Build OpenH264 plugin for mediastreamer2)
|
||||||
endif
|
endif
|
||||||
include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk
|
include $(linphone-root-dir)/submodules/msopenh264/Android.mk
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/openh264/Android.mk
|
||||||
|
endif
|
||||||
|
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
|
||||||
|
|
||||||
|
|
||||||
|
endif #_BUILD_VIDEO
|
||||||
|
|
||||||
|
|
||||||
|
ifeq ($(BUILD_ZRTP), 1)
|
||||||
|
ifeq (,$(DUMP_VAR))
|
||||||
|
$(info $(TARGET_ARCH_ABI): Build ZRTP support)
|
||||||
|
endif
|
||||||
|
include $(linphone-root-dir)/submodules/bzrtp/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_SRTP), 1)
|
ifeq ($(BUILD_SRTP), 1)
|
||||||
include $(linphone-root-dir)/submodules/externals/build/srtp/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/srtp/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
|
|
||||||
include $(linphone-root-dir)/submodules/linphone/build/android/Android.mk
|
include $(linphone-root-dir)/submodules/linphone/build/android/Android.mk
|
||||||
endif
|
|
||||||
include $(linphone-root-dir)/submodules/linphone/build/android/Android-no-neon.mk
|
|
||||||
|
|
||||||
_BUILD_AMR=0
|
_BUILD_AMR=0
|
||||||
ifneq ($(BUILD_AMRNB), 0)
|
ifneq ($(BUILD_AMRNB), 0)
|
||||||
|
|
@ -136,14 +147,40 @@ include $(linphone-root-dir)/submodules/bcg729/Android.mk
|
||||||
include $(linphone-root-dir)/submodules/bcg729/msbcg729/Android.mk
|
include $(linphone-root-dir)/submodules/bcg729/msbcg729/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(BUILD_WEBRTC_AECM), 0)
|
ifneq ($(BUILD_OPUS), 0)
|
||||||
ifneq ($(TARGET_ARCH), x86)
|
include $(linphone-root-dir)/submodules/externals/build/opus/Android.mk
|
||||||
|
endif
|
||||||
|
|
||||||
|
WEBRTC_BUILD_NEON_LIBS=false
|
||||||
|
|
||||||
|
# AECM
|
||||||
|
ifneq ($(BUILD_WEBRTC_AECM),0)
|
||||||
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
|
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
|
||||||
|
$(info $(TARGET_ARCH_ABI): Build NEON modules for AECM)
|
||||||
WEBRTC_BUILD_NEON_LIBS=true
|
WEBRTC_BUILD_NEON_LIBS=true
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
$(info $(TARGET_ARCH_ABI): Build AECM from WebRTC)
|
||||||
include $(linphone-root-dir)/submodules/externals/build/webrtc/system_wrappers/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/webrtc/system_wrappers/Android.mk
|
||||||
include $(linphone-root-dir)/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk
|
|
||||||
include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/utility/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/utility/Android.mk
|
||||||
include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/aecm/Android.mk
|
include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_processing/aecm/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# iSAC
|
||||||
|
ifneq ($(BUILD_WEBRTC_ISAC),0)
|
||||||
|
# don't build for neon in x86
|
||||||
|
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
|
||||||
|
$(info $(TARGET_ARCH_ABI): Build NEON modules for ISAC)
|
||||||
|
WEBRTC_BUILD_NEON_LIBS=true
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(info $(TARGET_ARCH_ABI): Build iSAC plugin for mediastreamer2)
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
|
||||||
|
endif
|
||||||
|
|
||||||
|
# common modules for ISAC and AECM
|
||||||
|
ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00)
|
||||||
|
$(info $(TARGET_ARCH_ABI): Build common modules for iSAC and AECM ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)))
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk
|
||||||
|
include $(linphone-root-dir)/submodules/mswebrtc/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -1,33 +1,74 @@
|
||||||
APP_PROJECT_PATH := $(call my-dir)/../
|
APP_PROJECT_PATH := $(call my-dir)/../
|
||||||
APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone liblinphonenoneon libneon
|
NDK_TOOLCHAIN_VERSION := 4.8
|
||||||
APP_STL := stlport_static
|
|
||||||
|
ifeq ($(BUILD_MEDIASTREAMER2_SDK),)
|
||||||
|
BUILD_MEDIASTREAMER2_SDK=0
|
||||||
|
endif
|
||||||
|
|
||||||
|
APP_MODULES :=libspeex libgsm libortp libmediastreamer2
|
||||||
|
ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
|
||||||
|
APP_MODULES += antlr3 libbellesip liblinphone liblpxml2
|
||||||
|
endif
|
||||||
|
|
||||||
|
#default values:
|
||||||
|
|
||||||
|
ifeq ($(BUILD_AMRNB),)
|
||||||
|
BUILD_AMRNB=light
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_AMRWB),)
|
||||||
|
BUILD_AMRWB=0
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_SRTP),)
|
||||||
|
BUILD_SRTP=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_X264),)
|
||||||
|
BUILD_X264=0
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_OPENH264),)
|
||||||
|
BUILD_OPENH264=0
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_G729),)
|
||||||
|
BUILD_G729=0
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_VIDEO),)
|
||||||
|
BUILD_VIDEO=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
|
||||||
|
#sqlite
|
||||||
|
ifeq ($(BUILD_SQLITE),1)
|
||||||
|
APP_MODULES += liblinsqlite
|
||||||
|
endif
|
||||||
|
|
||||||
#uPnp
|
#uPnp
|
||||||
ifeq ($(BUILD_UPNP),1)
|
ifeq ($(BUILD_UPNP),1)
|
||||||
APP_MODULES += libupnp
|
APP_MODULES += libupnp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#remote provisioning
|
ifeq ($(BUILD_TLS),1)
|
||||||
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
|
APP_MODULES +=polarssl
|
||||||
APP_MODULES += liblpxml2 libxml2lpc liblpc2xml
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#default values
|
ifeq ($(BUILD_VIDEO),1)
|
||||||
ifeq ($(BUILD_AMRNB),)
|
APP_MODULES += libffmpeg-linphone
|
||||||
BUILD_AMRNB=light
|
|
||||||
endif
|
|
||||||
ifeq ($(BUILD_AMRWB),)
|
|
||||||
BUILD_AMRWB=0
|
|
||||||
endif
|
|
||||||
ifeq ($(BUILD_SRTP),)
|
|
||||||
BUILD_SRTP=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(LINPHONE_VIDEO),1)
|
|
||||||
APP_MODULES += liblinavutil liblinavcore liblinavcodec liblinswscale
|
|
||||||
APP_MODULES += liblinavcodecnoneon
|
|
||||||
APP_MODULES += libvpx
|
APP_MODULES += libvpx
|
||||||
|
ifeq ($(BUILD_X264),1)
|
||||||
|
APP_MODULES +=libx264 libmsx264
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(BUILD_OPENH264),1)
|
||||||
|
APP_MODULES += libopenh264 libmsopenh264
|
||||||
|
endif
|
||||||
|
ifeq ($(BUILD_MATROSKA), 1)
|
||||||
|
APP_MODULES += libmatroska2
|
||||||
|
endif
|
||||||
|
endif # BUILD_VIDEO
|
||||||
|
|
||||||
_BUILD_AMR=0
|
_BUILD_AMR=0
|
||||||
ifneq ($(BUILD_AMRNB), 0)
|
ifneq ($(BUILD_AMRNB), 0)
|
||||||
|
|
@ -46,10 +87,6 @@ ifneq ($(BUILD_AMRWB), 0)
|
||||||
APP_MODULES += libvoamrwbenc
|
APP_MODULES += libvoamrwbenc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_X264),1)
|
|
||||||
APP_MODULES +=libx264 libmsx264
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(BUILD_SILK),1)
|
ifeq ($(BUILD_SILK),1)
|
||||||
APP_MODULES +=libmssilk
|
APP_MODULES +=libmssilk
|
||||||
endif
|
endif
|
||||||
|
|
@ -58,11 +95,25 @@ ifeq ($(BUILD_G729),1)
|
||||||
APP_MODULES +=libbcg729 libmsbcg729
|
APP_MODULES +=libbcg729 libmsbcg729
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(BUILD_WEBRTC_AECM), 0)
|
ifneq ($(BUILD_OPUS), 0)
|
||||||
APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm
|
APP_MODULES += libopus
|
||||||
APP_MODULES += libwebrtc_spl_neon libwebrtc_aecm_neon
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(BUILD_WEBRTC_AECM), 0)
|
||||||
|
APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm libmswebrtc
|
||||||
|
ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
|
||||||
|
APP_MODULES += libwebrtc_spl_neon libwebrtc_aecm_neon
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_WEBRTC_ISAC), 1)
|
||||||
|
APP_MODULES += libwebrtc_spl libwebrtc_isacfix libmswebrtc
|
||||||
|
ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
|
||||||
|
APP_MODULES += libwebrtc_spl_neon libwebrtc_isacfix_neon
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
|
||||||
ifeq ($(RING),yes)
|
ifeq ($(RING),yes)
|
||||||
APP_MODULES += libring
|
APP_MODULES += libring
|
||||||
endif
|
endif
|
||||||
|
|
@ -70,27 +121,32 @@ endif
|
||||||
ifeq ($(BUILD_TUNNEL), 1)
|
ifeq ($(BUILD_TUNNEL), 1)
|
||||||
APP_MODULES += libtunnelclient
|
APP_MODULES += libtunnelclient
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
|
ifeq ($(BUILD_ZRTP), 1)
|
||||||
APP_MODULES += liblincrypto liblinssl
|
APP_MODULES += libbzrtp
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BUILD_ILBC), 1)
|
||||||
APP_MODULES +=libmsilbc
|
APP_MODULES +=libmsilbc
|
||||||
|
|
||||||
ifeq ($(BUILD_GPLV3_ZRTP), 1)
|
|
||||||
APP_MODULES += libzrtpcpp
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BUILD_SRTP), 1)
|
ifeq ($(BUILD_SRTP), 1)
|
||||||
APP_MODULES += libsrtp
|
APP_MODULES += libsrtp
|
||||||
endif
|
endif
|
||||||
endif #armeabi-v7a
|
|
||||||
|
|
||||||
|
|
||||||
linphone-root-dir:=$(APP_PROJECT_PATH)
|
linphone-root-dir:=$(APP_PROJECT_PATH)
|
||||||
|
|
||||||
APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
|
APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
|
||||||
APP_PLATFORM := android-8
|
APP_PLATFORM := android-8
|
||||||
APP_ABI := armeabi-v7a armeabi
|
APP_ABI := armeabi-v7a
|
||||||
|
ifeq ($(BUILD_FOR_ARM), 1)
|
||||||
|
APP_ABI += armeabi
|
||||||
|
endif
|
||||||
ifeq ($(BUILD_FOR_X86), 1)
|
ifeq ($(BUILD_FOR_X86), 1)
|
||||||
APP_ABI += x86
|
APP_ABI += x86
|
||||||
endif
|
endif
|
||||||
APP_CFLAGS:=-DDISABLE_NEON
|
|
||||||
|
APP_CFLAGS += -Werror -Wall -Wno-strict-aliasing -Wno-unused-function
|
||||||
|
# Thanks cpufeature.c imported from the NDK...
|
||||||
|
APP_CFLAGS += -Wno-unused-variable
|
||||||
|
|
|
||||||
14
liblinphone_tester/.classpath
Normal file
14
liblinphone_tester/.classpath
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<classpath>
|
||||||
|
<classpathentry kind="src" path="linphone/j2se"/>
|
||||||
|
<classpathentry kind="src" path="linphone/impl"/>
|
||||||
|
<classpathentry kind="src" path="linphone/common"/>
|
||||||
|
<classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="mediastreamer2"/>
|
||||||
|
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||||
|
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||||
|
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||||
|
<classpathentry kind="src" path="src"/>
|
||||||
|
<classpathentry kind="src" path="gen"/>
|
||||||
|
<classpathentry kind="lib" path="libs/android-junit-report-1.5.8.jar"/>
|
||||||
|
<classpathentry kind="output" path="bin/classes"/>
|
||||||
|
</classpath>
|
||||||
20
liblinphone_tester/.gitignore
vendored
Normal file
20
liblinphone_tester/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
# built application files
|
||||||
|
*.apk
|
||||||
|
*.ap_
|
||||||
|
|
||||||
|
# files for the dex VM
|
||||||
|
*.dex
|
||||||
|
|
||||||
|
# Java class files
|
||||||
|
*.class
|
||||||
|
|
||||||
|
# generated files
|
||||||
|
bin/
|
||||||
|
gen/
|
||||||
|
libs/
|
||||||
|
obj/
|
||||||
|
|
||||||
|
# Local configuration file (sdk path, etc)
|
||||||
|
local.properties
|
||||||
|
|
||||||
|
assets
|
||||||
45
liblinphone_tester/.project
Normal file
45
liblinphone_tester/.project
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<projectDescription>
|
||||||
|
<name>liblinphoneTester</name>
|
||||||
|
<comment></comment>
|
||||||
|
<projects>
|
||||||
|
</projects>
|
||||||
|
<buildSpec>
|
||||||
|
<buildCommand>
|
||||||
|
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
</buildSpec>
|
||||||
|
<natures>
|
||||||
|
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
|
||||||
|
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||||
|
</natures>
|
||||||
|
<linkedResources>
|
||||||
|
<link>
|
||||||
|
<name>linphone</name>
|
||||||
|
<type>2</type>
|
||||||
|
<locationURI>PARENT-1-PROJECT_LOCATION/submodules/linphone/java</locationURI>
|
||||||
|
</link>
|
||||||
|
<link>
|
||||||
|
<name>mediastreamer2</name>
|
||||||
|
<type>2</type>
|
||||||
|
<locationURI>PARENT-1-PROJECT_LOCATION/submodules/linphone/mediastreamer2/java/src</locationURI>
|
||||||
|
</link>
|
||||||
|
</linkedResources>
|
||||||
|
</projectDescription>
|
||||||
54
liblinphone_tester/AndroidManifest.xml
Normal file
54
liblinphone_tester/AndroidManifest.xml
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="org.linphone.tester"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.0" >
|
||||||
|
|
||||||
|
<uses-sdk
|
||||||
|
android:minSdkVersion="8"
|
||||||
|
android:targetSdkVersion="17" />
|
||||||
|
|
||||||
|
<instrumentation
|
||||||
|
android:targetPackage="org.linphone.tester"
|
||||||
|
android:name="org.linphone.tester.TestRunner" />
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
|
||||||
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
|
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||||
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:debuggable="true"
|
||||||
|
android:icon="@drawable/ic_launcher"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:theme="@style/AppTheme" >
|
||||||
|
<activity
|
||||||
|
android:name="org.linphone.tester.MainActivity"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:screenOrientation="nosensor"
|
||||||
|
android:launchMode="singleTask">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
<activity
|
||||||
|
android:name="org.linphone.tester.LogsActivity"
|
||||||
|
android:label="@string/title_activity_logs"
|
||||||
|
android:screenOrientation="nosensor"
|
||||||
|
android:launchMode="singleTask">
|
||||||
|
</activity>
|
||||||
|
<activity
|
||||||
|
android:name="org.linphone.tester.SuitesActivity"
|
||||||
|
android:label="@string/title_activity_suites"
|
||||||
|
android:screenOrientation="nosensor"
|
||||||
|
android:launchMode="singleTask">
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<uses-library android:name="android.test.runner" />
|
||||||
|
|
||||||
|
</application>
|
||||||
|
</manifest>
|
||||||
5
liblinphone_tester/Makefile
Normal file
5
liblinphone_tester/Makefile
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
all:
|
||||||
|
ant debug install
|
||||||
|
|
||||||
|
run-all-tests: all
|
||||||
|
ant test
|
||||||
4
liblinphone_tester/adb-log-start.sh
Executable file
4
liblinphone_tester/adb-log-start.sh
Executable file
|
|
@ -0,0 +1,4 @@
|
||||||
|
#! /bin/bash
|
||||||
|
adb logcat -v time > $1 &
|
||||||
|
echo $! >adb.pid
|
||||||
|
|
||||||
2
liblinphone_tester/ant.properties
Normal file
2
liblinphone_tester/ant.properties
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
source.dir=src:../submodules/linphone/mediastreamer2/java/src:../submodules/linphone/java/j2se:../submodules/linphone/java/common:../submodules/linphone/java/impl
|
||||||
|
test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner
|
||||||
92
liblinphone_tester/build.xml
Normal file
92
liblinphone_tester/build.xml
Normal file
|
|
@ -0,0 +1,92 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project name="liblinphone_tester" default="help">
|
||||||
|
|
||||||
|
<!-- The local.properties file is created and updated by the 'android' tool.
|
||||||
|
It contains the path to the SDK. It should *NOT* be checked into
|
||||||
|
Version Control Systems. -->
|
||||||
|
<property file="local.properties" />
|
||||||
|
|
||||||
|
<!-- The ant.properties file can be created by you. It is only edited by the
|
||||||
|
'android' tool to add properties to it.
|
||||||
|
This is the place to change some Ant specific build properties.
|
||||||
|
Here are some properties you may want to change/update:
|
||||||
|
|
||||||
|
source.dir
|
||||||
|
The name of the source directory. Default is 'src'.
|
||||||
|
out.dir
|
||||||
|
The name of the output directory. Default is 'bin'.
|
||||||
|
|
||||||
|
For other overridable properties, look at the beginning of the rules
|
||||||
|
files in the SDK, at tools/ant/build.xml
|
||||||
|
|
||||||
|
Properties related to the SDK location or the project target should
|
||||||
|
be updated using the 'android' tool with the 'update' action.
|
||||||
|
|
||||||
|
This file is an integral part of the build system for your
|
||||||
|
application and should be checked into Version Control Systems.
|
||||||
|
|
||||||
|
-->
|
||||||
|
<property file="ant.properties" />
|
||||||
|
|
||||||
|
<!-- if sdk.dir was not set from one of the property file, then
|
||||||
|
get it from the ANDROID_HOME env var.
|
||||||
|
This must be done before we load project.properties since
|
||||||
|
the proguard config can use sdk.dir -->
|
||||||
|
<property environment="env" />
|
||||||
|
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
|
||||||
|
<isset property="env.ANDROID_HOME" />
|
||||||
|
</condition>
|
||||||
|
|
||||||
|
<!-- The project.properties file is created and updated by the 'android'
|
||||||
|
tool, as well as ADT.
|
||||||
|
|
||||||
|
This contains project specific properties such as project target, and library
|
||||||
|
dependencies. Lower level build properties are stored in ant.properties
|
||||||
|
(or in .classpath for Eclipse projects).
|
||||||
|
|
||||||
|
This file is an integral part of the build system for your
|
||||||
|
application and should be checked into Version Control Systems. -->
|
||||||
|
<loadproperties srcFile="project.properties" />
|
||||||
|
|
||||||
|
<!-- quick check on sdk.dir -->
|
||||||
|
<fail
|
||||||
|
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
|
||||||
|
unless="sdk.dir"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Import per project custom build rules if present at the root of the project.
|
||||||
|
This is the place to put custom intermediary targets such as:
|
||||||
|
-pre-build
|
||||||
|
-pre-compile
|
||||||
|
-post-compile (This is typically used for code obfuscation.
|
||||||
|
Compiled code location: ${out.classes.absolute.dir}
|
||||||
|
If this is not done in place, override ${out.dex.input.absolute.dir})
|
||||||
|
-post-package
|
||||||
|
-post-build
|
||||||
|
-pre-clean
|
||||||
|
-->
|
||||||
|
<import file="custom_rules.xml" optional="true" />
|
||||||
|
|
||||||
|
<!-- Import the actual build file.
|
||||||
|
|
||||||
|
To customize existing targets, there are two options:
|
||||||
|
- Customize only one target:
|
||||||
|
- copy/paste the target into this file, *before* the
|
||||||
|
<import> task.
|
||||||
|
- customize it to your needs.
|
||||||
|
- Customize the whole content of build.xml
|
||||||
|
- copy/paste the content of the rules files (minus the top node)
|
||||||
|
into this file, replacing the <import> task.
|
||||||
|
- customize to your needs.
|
||||||
|
|
||||||
|
***********************
|
||||||
|
****** IMPORTANT ******
|
||||||
|
***********************
|
||||||
|
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
||||||
|
in order to avoid having your file be overridden by tools such as "android update project"
|
||||||
|
-->
|
||||||
|
<!-- version-tag: 1 -->
|
||||||
|
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||||
|
|
||||||
|
</project>
|
||||||
79
liblinphone_tester/custom_rules.xml
Normal file
79
liblinphone_tester/custom_rules.xml
Normal file
|
|
@ -0,0 +1,79 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project name="custom_rules" xmlns:unless="ant:unless">
|
||||||
|
<target name="run">
|
||||||
|
<exec executable="adb">
|
||||||
|
<arg value="shell" />
|
||||||
|
<arg value="am" />
|
||||||
|
<arg value="start" />
|
||||||
|
<arg value="-a" />
|
||||||
|
<arg value="android.intent.action.MAIN" />
|
||||||
|
<arg value="-n" />
|
||||||
|
<arg value="org.linphone.tester/org.linphone.tester.MainActivity" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
<target name="test">
|
||||||
|
<property name="output.file" value="./tests.output" />
|
||||||
|
<tstamp>
|
||||||
|
<format property="archive.name" pattern="'liblinphonetester_'yyyyMMdd_HHmmss" />
|
||||||
|
</tstamp>
|
||||||
|
<echo>Adb log files are put in ${archive.name}.zip</echo>
|
||||||
|
|
||||||
|
<exec executable="adb" >
|
||||||
|
<arg value="logcat" />
|
||||||
|
<arg value="-c" />
|
||||||
|
</exec>
|
||||||
|
<exec executable="./adb-log-start.sh" >
|
||||||
|
<arg value=" ${archive.name}" />
|
||||||
|
</exec>
|
||||||
|
<exec executable="bash">
|
||||||
|
<arg value="-c"/>
|
||||||
|
<!-- use 'tee' command to write in file AND on stdout.
|
||||||
|
First is used below to check if tests failed or not while second
|
||||||
|
is used to get output in real time -->
|
||||||
|
<arg value="adb shell am instrument -r -w org.linphone.tester/org.linphone.tester.TestRunner | tee ${output.file}"/>
|
||||||
|
</exec>
|
||||||
|
<exec executable="bash" >
|
||||||
|
<arg value="-c" />
|
||||||
|
<arg value="kill `cat adb.pid`" />
|
||||||
|
</exec>
|
||||||
|
<condition property="has.crashed" >
|
||||||
|
<or>
|
||||||
|
<resourcecontains resource="${output.file}" substring="Process crashed" />
|
||||||
|
<resourcecontains resource="${output.file}" substring="Native crash" />
|
||||||
|
<resourcecontains resource="${output.file}" substring="longMsg=junit.framework.AssertionFailedError: View with id: '" />
|
||||||
|
<resourcecontains resource="${output.file}" substring="longMsg=java.lang.RuntimeException:" />
|
||||||
|
<resourcecontains resource="${output.file}" substring="longMsg=java.lang.NullPointerException:" />
|
||||||
|
</or>
|
||||||
|
</condition>
|
||||||
|
<exec executable="bash" unless:set="has.crashed">
|
||||||
|
<arg value="-c"/>
|
||||||
|
<arg value="adb shell run-as org.linphone.tester cat /data/data/org.linphone.tester/files/junit-report.xml > liblinphone-junit-report.xml"/>
|
||||||
|
</exec>
|
||||||
|
|
||||||
|
<zip destfile="${archive.name}.zip">
|
||||||
|
<fileset dir="." includes="${archive.name}"/>
|
||||||
|
</zip>
|
||||||
|
|
||||||
|
<antcall target="check-for-crash"/>
|
||||||
|
|
||||||
|
<fail message="Tests failed" status="42">
|
||||||
|
<condition>
|
||||||
|
<resourcecontains resource="${output.file}" substring="FAILURES" />
|
||||||
|
</condition>
|
||||||
|
</fail>
|
||||||
|
|
||||||
|
<delete file="${archive.name}"/>
|
||||||
|
<delete file="${output.file}"/>
|
||||||
|
</target>
|
||||||
|
<target name="check-for-crash" if="has.crashed">
|
||||||
|
<exec executable="bash" >
|
||||||
|
<arg value="-c" />
|
||||||
|
<arg value="tail -n 500 ${archive.name}" />
|
||||||
|
</exec>
|
||||||
|
<exec executable="bash" >
|
||||||
|
<arg value="-c" />
|
||||||
|
<arg value="cat ${archive.name} |ndk-stack -sym obj/local/`adb shell getprop ro.product.cpu.abi | tr -d '\r'`" />
|
||||||
|
</exec>
|
||||||
|
<fail message="Tests crashed" status="125"/>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
3
liblinphone_tester/jni/Android.mk
Normal file
3
liblinphone_tester/jni/Android.mk
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
include ../jni/Android.mk
|
||||||
|
include $(linphone-root-dir)/submodules/externals/build/cunit/Android.mk
|
||||||
|
include $(linphone-root-dir)/submodules/linphone/build/android/liblinphone_tester.mk
|
||||||
7
liblinphone_tester/jni/Application.mk
Normal file
7
liblinphone_tester/jni/Application.mk
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
LOCAL_PATH:= $(call my-dir)
|
||||||
|
include ../jni/Application.mk
|
||||||
|
APP_PROJECT_PATH := $(LOCAL_PATH)/../
|
||||||
|
APP_BUILD_SCRIPT := $(LOCAL_PATH)/Android.mk
|
||||||
|
APP_OPTIM := debug
|
||||||
|
|
||||||
|
APP_MODULES += cunit liblinphone_tester
|
||||||
BIN
liblinphone_tester/libs/android-junit-report-1.5.8.jar
Normal file
BIN
liblinphone_tester/libs/android-junit-report-1.5.8.jar
Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
12
liblinphone_tester/res/layout/activity_logs.xml
Normal file
12
liblinphone_tester/res/layout/activity_logs.xml
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:scrollbars="vertical"
|
||||||
|
tools:context=".LogsActivity">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView1"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="" />
|
||||||
|
</ScrollView>
|
||||||
15
liblinphone_tester/res/layout/activity_main.xml
Normal file
15
liblinphone_tester/res/layout/activity_main.xml
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".SuitesActivity" >
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/suites_list"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:orientation="vertical" >
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
15
liblinphone_tester/res/layout/activity_suites.xml
Normal file
15
liblinphone_tester/res/layout/activity_suites.xml
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".SuitesActivity" >
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/tests_list"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical" >
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
9
liblinphone_tester/res/menu/activity_logs.xml
Normal file
9
liblinphone_tester/res/menu/activity_logs.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_settings"
|
||||||
|
android:orderInCategory="100"
|
||||||
|
android:showAsAction="never"
|
||||||
|
android:title="@string/menu_settings"/>
|
||||||
|
|
||||||
|
</menu>
|
||||||
9
liblinphone_tester/res/menu/activity_main.xml
Normal file
9
liblinphone_tester/res/menu/activity_main.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_settings"
|
||||||
|
android:orderInCategory="100"
|
||||||
|
android:showAsAction="never"
|
||||||
|
android:title="@string/menu_settings"/>
|
||||||
|
|
||||||
|
</menu>
|
||||||
9
liblinphone_tester/res/menu/activity_suites.xml
Normal file
9
liblinphone_tester/res/menu/activity_suites.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_settings"
|
||||||
|
android:orderInCategory="100"
|
||||||
|
android:showAsAction="never"
|
||||||
|
android:title="@string/menu_settings"/>
|
||||||
|
|
||||||
|
</menu>
|
||||||
11
liblinphone_tester/res/values-v11/styles.xml
Normal file
11
liblinphone_tester/res/values-v11/styles.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Base application theme for API 11+. This theme completely replaces
|
||||||
|
AppBaseTheme from res/values/styles.xml on API 11+ devices.
|
||||||
|
-->
|
||||||
|
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
|
||||||
|
<!-- API 11 theme customizations can go here. -->
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
12
liblinphone_tester/res/values-v14/styles.xml
Normal file
12
liblinphone_tester/res/values-v14/styles.xml
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Base application theme for API 14+. This theme completely replaces
|
||||||
|
AppBaseTheme from BOTH res/values/styles.xml and
|
||||||
|
res/values-v11/styles.xml on API 14+ devices.
|
||||||
|
-->
|
||||||
|
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
|
||||||
|
<!-- API 14 theme customizations can go here. -->
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
10
liblinphone_tester/res/values/strings.xml
Normal file
10
liblinphone_tester/res/values/strings.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<string name="app_name">liblinphone tester</string>
|
||||||
|
<string name="all">All</string>
|
||||||
|
<string name="menu_settings">Settings</string>
|
||||||
|
<string name="title_activity_logs">LogsActivity</string>
|
||||||
|
<string name="title_activity_suites">SuitesActivity</string>
|
||||||
|
|
||||||
|
</resources>
|
||||||
20
liblinphone_tester/res/values/styles.xml
Normal file
20
liblinphone_tester/res/values/styles.xml
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Base application theme, dependent on API level. This theme is replaced
|
||||||
|
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
|
||||||
|
-->
|
||||||
|
<style name="AppBaseTheme" parent="android:Theme.Light">
|
||||||
|
<!--
|
||||||
|
Theme customizations available in newer API levels can go in
|
||||||
|
res/values-vXX/styles.xml, while customizations related to
|
||||||
|
backward-compatibility can go here.
|
||||||
|
-->
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<!-- Application theme. -->
|
||||||
|
<style name="AppTheme" parent="AppBaseTheme">
|
||||||
|
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
92
liblinphone_tester/src/org/linphone/tester/LogsActivity.java
Normal file
92
liblinphone_tester/src/org/linphone/tester/LogsActivity.java
Normal file
|
|
@ -0,0 +1,92 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
public class LogsActivity extends Activity {
|
||||||
|
private String mLogs = "";
|
||||||
|
private LogsThread mLogsThread;
|
||||||
|
private class LogsThread extends Thread {
|
||||||
|
LogsActivity mLogsActivity;
|
||||||
|
String mArgs[];
|
||||||
|
TesterLogger tester;
|
||||||
|
public LogsThread(LogsActivity logsActivity, String[] args) {
|
||||||
|
mLogsActivity = logsActivity;
|
||||||
|
mArgs = args;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
String path = mLogsActivity.getFilesDir().getAbsolutePath()+"/config_files";
|
||||||
|
tester = new TesterLogger(mLogsActivity);
|
||||||
|
List<String> list = new LinkedList<String>(Arrays.asList(new String[]{"tester", "--verbose", "--config", path}));
|
||||||
|
list.addAll(Arrays.asList(mArgs));
|
||||||
|
String[] array = list.toArray(new String[list.size()]);
|
||||||
|
tester.run(array);
|
||||||
|
Tester.clearAccounts();
|
||||||
|
mLogsActivity.runOnUiThread(new Runnable() {
|
||||||
|
public void run() {
|
||||||
|
mLogsActivity.done();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String join(String [] array, String separator) {
|
||||||
|
String ret = "";
|
||||||
|
for(int i = 0; i < array.length; ++i) {
|
||||||
|
if(i != 0) {
|
||||||
|
ret += separator;
|
||||||
|
}
|
||||||
|
ret += array[i];
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_logs);
|
||||||
|
((TextView)findViewById(R.id.textView1)).setText(mLogs);
|
||||||
|
Bundle extras = getIntent().getExtras();
|
||||||
|
if (extras != null) {
|
||||||
|
String[] values = extras.getStringArray("args");
|
||||||
|
if(values != null) {
|
||||||
|
if(mLogsThread == null || !mLogsThread.isAlive()) {
|
||||||
|
this.setTitle("Test Logs (" + join(values, " ") + ")");
|
||||||
|
mLogs = "";
|
||||||
|
((TextView)findViewById(R.id.textView1)).setText(mLogs);
|
||||||
|
mLogsThread = new LogsThread(this, values);
|
||||||
|
mLogsThread.start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
// Inflate the menu; this adds items to the action bar if it is present.
|
||||||
|
getMenuInflater().inflate(R.menu.activity_logs, menu);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addLog(int level, String message) {
|
||||||
|
mLogs += message;
|
||||||
|
((TextView)findViewById(R.id.textView1)).append(message);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
if(mLogsThread == null || !mLogsThread.isAlive()) {
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void done() {
|
||||||
|
}
|
||||||
|
}
|
||||||
80
liblinphone_tester/src/org/linphone/tester/MainActivity.java
Normal file
80
liblinphone_tester/src/org/linphone/tester/MainActivity.java
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.lang.Override;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.res.AssetManager;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.Gravity;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
|
||||||
|
public class MainActivity extends Activity {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
setContentView(R.layout.activity_main);
|
||||||
|
try {
|
||||||
|
TestUnit.copyAssetsFromPackage(getApplicationContext());
|
||||||
|
} catch (IOException e) {
|
||||||
|
Log.e("liblinphone_tester", "Cannot install rc files",e);
|
||||||
|
}
|
||||||
|
Tester.keepAccounts(true);
|
||||||
|
TesterList suitesTest = new TesterList();
|
||||||
|
suitesTest.run(new String[]{"tester", "--list-suites"});
|
||||||
|
LinearLayout layout = ((LinearLayout)findViewById(R.id.suites_list));
|
||||||
|
layout.removeAllViews();
|
||||||
|
addButton(layout, "All", null);
|
||||||
|
for(String str: suitesTest.getList()) {
|
||||||
|
str = str.trim();
|
||||||
|
addButton(layout, str, str);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDestroy(){
|
||||||
|
Tester.clearAccounts();
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addButton(LinearLayout layout, String text, String data) {
|
||||||
|
Button button = new Button(this);
|
||||||
|
button.setText(text);
|
||||||
|
button.setTag(data);
|
||||||
|
button.setGravity(Gravity.CENTER);
|
||||||
|
button.setOnClickListener(new Button.OnClickListener() {
|
||||||
|
public void onClick(View v) {
|
||||||
|
Button button = (Button) v;
|
||||||
|
String data = (String)button.getTag();
|
||||||
|
if(data == null) {
|
||||||
|
Intent intent = new Intent(getBaseContext(), LogsActivity.class);
|
||||||
|
intent.putExtra("args", new String[]{});
|
||||||
|
startActivity(intent);
|
||||||
|
} else {
|
||||||
|
Intent intent = new Intent(getBaseContext(), SuitesActivity.class);
|
||||||
|
intent.putExtra("suite", data);
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
layout.addView(button);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
// Inflate the menu; this adds items to the action bar if it is present.
|
||||||
|
getMenuInflater().inflate(R.menu.activity_main, menu);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,70 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.view.Gravity;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
|
||||||
|
public class SuitesActivity extends Activity {
|
||||||
|
String mSuite;
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_suites);
|
||||||
|
Bundle extras = getIntent().getExtras();
|
||||||
|
if (extras != null) {
|
||||||
|
mSuite = extras.getString("suite");
|
||||||
|
if(mSuite != null) {
|
||||||
|
this.setTitle(this.getResources().getString(R.string.app_name) + " | " + mSuite);
|
||||||
|
TesterList suitesTest = new TesterList();
|
||||||
|
suitesTest.run(new String[]{"tester", "--list-tests", mSuite});
|
||||||
|
LinearLayout layout = ((LinearLayout)findViewById(R.id.tests_list));
|
||||||
|
layout.removeAllViews();
|
||||||
|
addButton(layout, "All", null);
|
||||||
|
for(String str: suitesTest.getList()) {
|
||||||
|
str = str.trim();
|
||||||
|
addButton(layout, str, str);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
private void addButton(LinearLayout layout, String text, String data) {
|
||||||
|
Button button = new Button(this);
|
||||||
|
button.setText(text);
|
||||||
|
button.setTag(data);
|
||||||
|
button.setGravity(Gravity.CENTER);
|
||||||
|
button.setOnClickListener(new Button.OnClickListener() {
|
||||||
|
public void onClick(View v) {
|
||||||
|
Button button = (Button) v;
|
||||||
|
String data = (String)button.getTag();
|
||||||
|
if(mSuite != null) {
|
||||||
|
if(data == null) {
|
||||||
|
Intent intent = new Intent(getBaseContext(), LogsActivity.class);
|
||||||
|
intent.putExtra("args", new String[]{"--suite", mSuite});
|
||||||
|
startActivity(intent);
|
||||||
|
} else {
|
||||||
|
Intent intent = new Intent(getBaseContext(), LogsActivity.class);
|
||||||
|
intent.putExtra("args", new String[]{"--suite", mSuite, "--test", data});
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
layout.addView(button);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
// Inflate the menu; this adds items to the action bar if it is present.
|
||||||
|
getMenuInflater().inflate(R.menu.activity_suites, menu);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
59
liblinphone_tester/src/org/linphone/tester/TestRunner.java
Normal file
59
liblinphone_tester/src/org/linphone/tester/TestRunner.java
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
import junit.framework.TestSuite;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import com.zutubi.android.junitreport.JUnitReportTestRunner;
|
||||||
|
|
||||||
|
import java.lang.Override;
|
||||||
|
|
||||||
|
|
||||||
|
public class TestRunner extends JUnitReportTestRunner {
|
||||||
|
String mSuite = null;
|
||||||
|
String mTest = null;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle arguments) {
|
||||||
|
mSuite = arguments.getString("suite");
|
||||||
|
mTest = arguments.getString("test");
|
||||||
|
Tester.keepAccounts(true);
|
||||||
|
|
||||||
|
super.onCreate(arguments);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
Tester.clearAccounts();
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TestSuite getAllTests () {
|
||||||
|
TestSuite suite = new TestSuite("Tests");
|
||||||
|
suite.addTest(new WrapperTester());
|
||||||
|
addSuites(suite, mSuite, mTest);
|
||||||
|
return suite;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void addSuites(TestSuite suite, String suiteCheck, String testCheck) {
|
||||||
|
TesterList testerList = new TesterList();
|
||||||
|
testerList.run(new String[]{"tester", "--list-suites"});
|
||||||
|
for(String str: testerList.getList()) {
|
||||||
|
str = str.trim();
|
||||||
|
if(suiteCheck == null || suiteCheck.equals(str)) {
|
||||||
|
addSuite(suite, str, testCheck);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void addSuite(TestSuite suite, String suiteStr, String testCheck) {
|
||||||
|
TesterList testerList = new TesterList();
|
||||||
|
testerList.run(new String[]{"tester", "--list-tests", suiteStr});
|
||||||
|
for(String str: testerList.getList()) {
|
||||||
|
str = str.trim();
|
||||||
|
if(testCheck == null || testCheck.equals(str)) {
|
||||||
|
suite.addTest(new TestUnit(suiteStr, str));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
87
liblinphone_tester/src/org/linphone/tester/TestUnit.java
Normal file
87
liblinphone_tester/src/org/linphone/tester/TestUnit.java
Normal file
|
|
@ -0,0 +1,87 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import junit.framework.Assert;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.test.AndroidTestCase;
|
||||||
|
|
||||||
|
public class TestUnit extends AndroidTestCase {
|
||||||
|
private String mSuite;
|
||||||
|
private String mTest;
|
||||||
|
static Boolean isAssetCopied=false;
|
||||||
|
|
||||||
|
public TestUnit(String suite, String test) {
|
||||||
|
mSuite = suite;
|
||||||
|
mTest = test;
|
||||||
|
setName(suite + "/" + test);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TestUnit(String name) {
|
||||||
|
String[] tab = name.split("/");
|
||||||
|
mSuite = tab[0];
|
||||||
|
mTest = tab[1];
|
||||||
|
setName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static public void copyAssetsFromPackage(Context ctx) throws IOException {
|
||||||
|
copyAssetsFromPackage(ctx,"config_files");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static void copyAssetsFromPackage(Context ctx,String fromPath) throws IOException {
|
||||||
|
new File(ctx.getFilesDir().getPath()+"/"+fromPath).mkdir();
|
||||||
|
|
||||||
|
for (String f :ctx.getAssets().list(fromPath)) {
|
||||||
|
String current_name=fromPath+"/"+f;
|
||||||
|
InputStream lInputStream;
|
||||||
|
try {
|
||||||
|
lInputStream = ctx.getAssets().open(current_name);
|
||||||
|
} catch (IOException e) {
|
||||||
|
//probably a dir
|
||||||
|
new File(ctx.getFilesDir().getPath()+"/"+current_name).mkdir();
|
||||||
|
copyAssetsFromPackage(ctx,current_name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
FileOutputStream lOutputStream = new FileOutputStream(new File(ctx.getFilesDir().getPath()+"/"+current_name));//ctx.openFileOutput (fromPath+"/"+f, 0);
|
||||||
|
|
||||||
|
|
||||||
|
int readByte;
|
||||||
|
byte[] buff = new byte[8048];
|
||||||
|
while (( readByte = lInputStream.read(buff)) != -1) {
|
||||||
|
lOutputStream.write(buff,0, readByte);
|
||||||
|
}
|
||||||
|
lOutputStream.flush();
|
||||||
|
lOutputStream.close();
|
||||||
|
lInputStream.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
if (isAssetCopied ==false) {
|
||||||
|
copyAssetsFromPackage(getContext());
|
||||||
|
isAssetCopied=true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void tearDown() throws Exception {
|
||||||
|
super.tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void runTest() {
|
||||||
|
String path = getContext().getFilesDir().getPath()+"/config_files";
|
||||||
|
Tester tester = new Tester();
|
||||||
|
List<String> list = new LinkedList<String>(Arrays.asList(new String[]{"tester", "--verbose", "--config", path, "--suite", mSuite, "--test", mTest}));
|
||||||
|
String[] array = list.toArray(new String[list.size()]);
|
||||||
|
Assert.assertTrue(tester.run(array) == 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
76
liblinphone_tester/src/org/linphone/tester/Tester.java
Normal file
76
liblinphone_tester/src/org/linphone/tester/Tester.java
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.linphone.core.LinphoneCoreFactory;
|
||||||
|
import org.linphone.mediastream.Version;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
public class Tester {
|
||||||
|
public static String TAG = "liblinphone-tester";
|
||||||
|
private static boolean loadOptionalLibrary(String s) {
|
||||||
|
try {
|
||||||
|
System.loadLibrary(s);
|
||||||
|
return true;
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Log.w("Unable to load optional library lib", s);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isArmv7()
|
||||||
|
{
|
||||||
|
return System.getProperty("os.arch").contains("armv7");
|
||||||
|
}
|
||||||
|
|
||||||
|
static {
|
||||||
|
System.loadLibrary("cunit");
|
||||||
|
List<String> cpuabis=Version.getCpuAbis();
|
||||||
|
String ffmpegAbi;
|
||||||
|
boolean libLoaded=false;
|
||||||
|
Throwable firstException=null;
|
||||||
|
for (String abi : cpuabis){
|
||||||
|
Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi);
|
||||||
|
ffmpegAbi=abi;
|
||||||
|
// FFMPEG (audio/video)
|
||||||
|
if (abi.startsWith("armeabi")) {
|
||||||
|
ffmpegAbi="arm";
|
||||||
|
}
|
||||||
|
loadOptionalLibrary("ffmpeg-linphone-"+ffmpegAbi);
|
||||||
|
//Main library
|
||||||
|
try {
|
||||||
|
System.loadLibrary("linphone-" + abi);
|
||||||
|
System.loadLibrary("linphone_tester-" + abi);
|
||||||
|
|
||||||
|
Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
|
||||||
|
libLoaded=true;
|
||||||
|
break;
|
||||||
|
}catch(Throwable e) {
|
||||||
|
if (firstException == null) firstException=e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!libLoaded){
|
||||||
|
throw new RuntimeException(firstException);
|
||||||
|
|
||||||
|
}else{
|
||||||
|
Version.dumpCapabilities();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public native int run(String args[]);
|
||||||
|
public static native void keepAccounts(boolean keep);
|
||||||
|
public static native void clearAccounts();
|
||||||
|
|
||||||
|
public void printLog(final int level, final String message) {
|
||||||
|
switch(level) {
|
||||||
|
case 0:
|
||||||
|
android.util.Log.i(TAG, message);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
android.util.Log.e(TAG, message);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
16
liblinphone_tester/src/org/linphone/tester/TesterList.java
Normal file
16
liblinphone_tester/src/org/linphone/tester/TesterList.java
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class TesterList extends Tester {
|
||||||
|
private List<String> list = new LinkedList<String>();
|
||||||
|
public void printLog(final int level, final String message) {
|
||||||
|
super.printLog(level, message);
|
||||||
|
list.add(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getList() {
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
}
|
||||||
16
liblinphone_tester/src/org/linphone/tester/TesterLogger.java
Normal file
16
liblinphone_tester/src/org/linphone/tester/TesterLogger.java
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
public class TesterLogger extends Tester {
|
||||||
|
private LogsActivity mLogsActivity;
|
||||||
|
TesterLogger(LogsActivity logsActivity) {
|
||||||
|
mLogsActivity = logsActivity;
|
||||||
|
}
|
||||||
|
public void printLog(final int level, final String message) {
|
||||||
|
super.printLog(level, message);
|
||||||
|
mLogsActivity.runOnUiThread(new Runnable() {
|
||||||
|
public void run() {
|
||||||
|
mLogsActivity.addLog(level, message);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
110
liblinphone_tester/src/org/linphone/tester/WrapperTester.java
Normal file
110
liblinphone_tester/src/org/linphone/tester/WrapperTester.java
Normal file
|
|
@ -0,0 +1,110 @@
|
||||||
|
package org.linphone.tester;
|
||||||
|
|
||||||
|
import org.linphone.core.LinphoneCallParams;
|
||||||
|
import org.linphone.core.LinphoneCore;
|
||||||
|
import org.linphone.core.LinphoneCoreFactory;
|
||||||
|
import org.linphone.core.LinphoneCoreListenerBase;
|
||||||
|
import org.linphone.core.LinphoneFriend;
|
||||||
|
import org.linphone.core.PayloadType;
|
||||||
|
import org.linphone.mediastream.MediastreamerAndroidContext;
|
||||||
|
|
||||||
|
import android.test.AndroidTestCase;
|
||||||
|
import junit.framework.Assert;
|
||||||
|
|
||||||
|
public class WrapperTester extends AndroidTestCase {
|
||||||
|
|
||||||
|
public WrapperTester() {
|
||||||
|
super();
|
||||||
|
setName("wrapper tester");
|
||||||
|
}
|
||||||
|
|
||||||
|
LinphoneCore mCore;
|
||||||
|
@Override
|
||||||
|
protected void runTest() throws Throwable {
|
||||||
|
//multicast begin
|
||||||
|
mCore.enableAudioMulticast(true);
|
||||||
|
Assert.assertEquals(true, mCore.audioMulticastEnabled());
|
||||||
|
mCore.enableAudioMulticast(false);
|
||||||
|
Assert.assertEquals(false, mCore.audioMulticastEnabled());
|
||||||
|
|
||||||
|
mCore.enableVideoMulticast(true);
|
||||||
|
Assert.assertEquals(true, mCore.videoMulticastEnabled());
|
||||||
|
mCore.enableVideoMulticast(false);
|
||||||
|
Assert.assertEquals(false, mCore.videoMulticastEnabled());
|
||||||
|
|
||||||
|
LinphoneCallParams params = mCore.createDefaultCallParameters();
|
||||||
|
params.enableAudioMulticast(true);
|
||||||
|
Assert.assertEquals(true, params.audioMulticastEnabled());
|
||||||
|
params.enableAudioMulticast(false);
|
||||||
|
Assert.assertEquals(false, params.audioMulticastEnabled());
|
||||||
|
|
||||||
|
params.enableVideoMulticast(true);
|
||||||
|
Assert.assertEquals(true, params.videoMulticastEnabled());
|
||||||
|
params.enableVideoMulticast(false);
|
||||||
|
Assert.assertEquals(false, params.videoMulticastEnabled());
|
||||||
|
|
||||||
|
|
||||||
|
String ip = "224.3.2.1";
|
||||||
|
mCore.setAudioMulticastAddr(ip);
|
||||||
|
Assert.assertEquals(ip, mCore.getAudioMulticastAddr());
|
||||||
|
|
||||||
|
ip = "224.3.2.3";
|
||||||
|
mCore.setVideoMulticastAddr(ip);
|
||||||
|
Assert.assertEquals(ip, mCore.getVideoMulticastAddr());
|
||||||
|
|
||||||
|
mCore.setAudioMulticastTtl(3);
|
||||||
|
Assert.assertEquals(3, mCore.getAudioMulticastTtl());
|
||||||
|
|
||||||
|
mCore.setVideoMulticastTtl(4);
|
||||||
|
Assert.assertEquals(4, mCore.getVideoMulticastTtl());
|
||||||
|
//multicast end
|
||||||
|
|
||||||
|
//Test setPrimaryContact
|
||||||
|
String address = "Linphone Android <sip:linphone.android@unknown-host>";
|
||||||
|
mCore.setPrimaryContact(address);
|
||||||
|
Assert.assertEquals(LinphoneCoreFactory.instance().createLinphoneAddress(address).getDisplayName(),
|
||||||
|
LinphoneCoreFactory.instance().createLinphoneAddress(mCore.getPrimaryContact()).getDisplayName());
|
||||||
|
Assert.assertEquals(LinphoneCoreFactory.instance().createLinphoneAddress(address).getUserName(),
|
||||||
|
LinphoneCoreFactory.instance().createLinphoneAddress(mCore.getPrimaryContact()).getUserName());
|
||||||
|
|
||||||
|
//Test setPayloadTypeNumber
|
||||||
|
mCore.setPayloadTypeNumber(mCore.findPayloadType("PCMU"),12);
|
||||||
|
Assert.assertEquals(mCore.getPayloadTypeNumber(mCore.findPayloadType("PCMU")),12);
|
||||||
|
|
||||||
|
PayloadType[] audioCodecs = mCore.getAudioCodecs();
|
||||||
|
int audioCodecsNb = audioCodecs.length;
|
||||||
|
if (audioCodecsNb >= 1) {
|
||||||
|
PayloadType[] newAudioCodecs = new PayloadType[audioCodecsNb - 1];
|
||||||
|
System.arraycopy(audioCodecs, 1, newAudioCodecs, 0, audioCodecsNb - 1);
|
||||||
|
mCore.setAudioCodecs(newAudioCodecs);
|
||||||
|
audioCodecs = mCore.getAudioCodecs();
|
||||||
|
Assert.assertEquals(audioCodecs.length, audioCodecsNb - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Test LinphoneFriend ref key
|
||||||
|
String key = "12";
|
||||||
|
LinphoneFriend friend = LinphoneCoreFactory.instance().createLinphoneFriend("sip:lala@test.linphone.org");
|
||||||
|
friend.setRefKey(key);
|
||||||
|
Assert.assertEquals(friend.getRefKey(),key);
|
||||||
|
|
||||||
|
MediastreamerAndroidContext.enableFilterFromName("MSUlawEnc", false);
|
||||||
|
Assert.assertFalse(MediastreamerAndroidContext.filterFromNameEnabled("MSUlawEnc"));
|
||||||
|
MediastreamerAndroidContext.enableFilterFromName("MSUlawEnc", true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
super.setUp();
|
||||||
|
mCore = LinphoneCoreFactory.instance().createLinphoneCore(new LinphoneCoreListenerBase(),null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void tearDown() throws Exception {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
super.tearDown();
|
||||||
|
mCore.destroy();
|
||||||
|
mCore=null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Binary file not shown.
11
patches/ffmpeg_non_versioned_soname.patch
Normal file
11
patches/ffmpeg_non_versioned_soname.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- submodules/externals/ffmpeg/library.mak.orig 2013-09-26 10:58:19.000000000 +0200
|
||||||
|
+++ submodules/externals/ffmpeg/library.mak 2013-09-26 10:58:13.000000000 +0200
|
||||||
|
@@ -54,7 +54,7 @@
|
||||||
|
|
||||||
|
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
|
||||||
|
$(SLIB_CREATE_DEF_CMD)
|
||||||
|
- $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
|
||||||
|
+ $$(LD) $(subst $$(@F),$(SLIBNAME),$(SHFLAGS)) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
|
||||||
|
$(SLIB_EXTRA_CMD)
|
||||||
|
|
||||||
|
ifdef SUBDIR
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
--- submodules/externals/ffmpeg/libavcodec/arm/int_neon.S.orig 2011-09-30 19:43:21.935593025 +0200
|
|
||||||
+++ submodules/externals/ffmpeg/libavcodec/arm/int_neon.S 2011-09-30 19:44:21.115168033 +0200
|
|
||||||
@@ -35,11 +35,11 @@
|
|
||||||
|
|
||||||
vdup.s32 q12, r3
|
|
||||||
1: vld1.16 {d16-d17}, [r0]!
|
|
||||||
- vld1.16 {d20-d21}, [r1,:128]!
|
|
||||||
+ vld1.16 {d20-d21}, [r1]!
|
|
||||||
vmull.s16 q12, d16, d20
|
|
||||||
vld1.16 {d18-d19}, [r0]!
|
|
||||||
vmull.s16 q13, d17, d21
|
|
||||||
- vld1.16 {d22-d23}, [r1,:128]!
|
|
||||||
+ vld1.16 {d22-d23}, [r1]!
|
|
||||||
vmull.s16 q14, d18, d22
|
|
||||||
vmull.s16 q15, d19, d23
|
|
||||||
vshl.s32 q8, q12, q12
|
|
||||||
@@ -55,11 +55,11 @@
|
|
||||||
b 3f
|
|
||||||
|
|
||||||
2: vld1.16 {d16-d17}, [r0]!
|
|
||||||
- vld1.16 {d20-d21}, [r1,:128]!
|
|
||||||
+ vld1.16 {d20-d21}, [r1]!
|
|
||||||
vmlal.s16 q0, d16, d20
|
|
||||||
vld1.16 {d18-d19}, [r0]!
|
|
||||||
vmlal.s16 q1, d17, d21
|
|
||||||
- vld1.16 {d22-d23}, [r1,:128]!
|
|
||||||
+ vld1.16 {d22-d23}, [r1]!
|
|
||||||
vmlal.s16 q2, d18, d22
|
|
||||||
vmlal.s16 q3, d19, d23
|
|
||||||
subs r2, r2, #16
|
|
||||||
36
patches/libvpx_configure_android_x86.patch
Normal file
36
patches/libvpx_configure_android_x86.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
--- a/submodules/externals/libvpx/build/make/configure.sh
|
||||||
|
+++ b/submodules/externals/libvpx/build/make/configure.sh
|
||||||
|
@@ -1037,6 +1037,33 @@ EOF
|
||||||
|
os2)
|
||||||
|
AS=${AS:-nasm}
|
||||||
|
;;
|
||||||
|
+ android*)
|
||||||
|
+ SDK_PATH=${sdk_path}
|
||||||
|
+ COMPILER_LOCATION=`find "${SDK_PATH}" \
|
||||||
|
+ -name "i686-linux-android-gcc*" -print -quit`
|
||||||
|
+ TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android-
|
||||||
|
+ CC=${TOOLCHAIN_PATH}gcc
|
||||||
|
+ CXX=${TOOLCHAIN_PATH}g++
|
||||||
|
+ AR=${TOOLCHAIN_PATH}ar
|
||||||
|
+ LD=${TOOLCHAIN_PATH}gcc
|
||||||
|
+ STRIP=${TOOLCHAIN_PATH}strip
|
||||||
|
+ NM=${TOOLCHAIN_PATH}nm
|
||||||
|
+
|
||||||
|
+ if [ -z "${alt_libc}" ]; then
|
||||||
|
+ alt_libc=`find "${SDK_PATH}" -name arch-x86 -print | \
|
||||||
|
+ awk '{n = split($0,a,"/"); \
|
||||||
|
+ split(a[n-1],b,"-"); \
|
||||||
|
+ print $0 " " b[2]}' | \
|
||||||
|
+ sort -g -k 2 | \
|
||||||
|
+ awk '{ print $1 }' | tail -1`
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ add_cflags "--sysroot=${alt_libc}"
|
||||||
|
+ add_ldflags "--sysroot=${alt_libc}"
|
||||||
|
+
|
||||||
|
+ soft_enable realtime_only
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
esac
|
||||||
|
|
||||||
|
AS="${alt_as:-${AS:-auto}}"
|
||||||
40
patches/openh264-permissive.patch
Normal file
40
patches/openh264-permissive.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
commit 6b3de978d928b6c0baec3305c9803c21a4367d0c
|
||||||
|
Author: Simon Morlat <simon.morlat@linphone.org>
|
||||||
|
Date: Tue Apr 15 15:19:37 2014 +0200
|
||||||
|
|
||||||
|
permissive mode: allow reference frames to be used even if there were lost slices.
|
||||||
|
|
||||||
|
diff --git a/codec/decoder/core/src/manage_dec_ref.cpp b/codec/decoder/core/src/manage_dec_ref.cpp
|
||||||
|
index dcf61ca..5582ec9 100644
|
||||||
|
--- a/codec/decoder/core/src/manage_dec_ref.cpp
|
||||||
|
+++ b/codec/decoder/core/src/manage_dec_ref.cpp
|
||||||
|
@@ -165,6 +165,7 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) {
|
||||||
|
&& (pSliceHeader->iSpsId != ppRefList[i]->iSpsId)) { //check;
|
||||||
|
WelsLog (pCtx, WELS_LOG_WARNING, "WelsReorderRefList()-1::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d\n",
|
||||||
|
pSliceHeader->iSpsId, ppRefList[i]->iSpsId);
|
||||||
|
+ return ERR_NONE;
|
||||||
|
pCtx->iErrorCode = dsNoParamSets; //cross-IDR reference frame selection, SHOULD request IDR.--
|
||||||
|
return ERR_INFO_REFERENCE_PIC_LOST;
|
||||||
|
} else {
|
||||||
|
|
||||||
|
commit a1f3b95ad18d0788c2c803fac80e78d6365673ce
|
||||||
|
Author: Simon Morlat <simon.morlat@linphone.org>
|
||||||
|
Date: Tue Apr 15 17:54:58 2014 +0200
|
||||||
|
|
||||||
|
permissive mode (2)
|
||||||
|
|
||||||
|
diff --git a/codec/decoder/core/src/decoder_core.cpp b/codec/decoder/core/src/decoder_core.cpp
|
||||||
|
index a14e971..e742dbf 100644
|
||||||
|
--- a/codec/decoder/core/src/decoder_core.cpp
|
||||||
|
+++ b/codec/decoder/core/src/decoder_core.cpp
|
||||||
|
@@ -1738,8 +1738,8 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, int3
|
||||||
|
if ((iLastIdD < 0) || //case 1: first layer
|
||||||
|
(iLastIdD == iCurrIdD)) { //case 2: same uiDId
|
||||||
|
InitDqLayerInfo (dq_cur, &pLayerInfo, pNalCur, pCtx->pDec);
|
||||||
|
-
|
||||||
|
- if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) {
|
||||||
|
+ if (0){
|
||||||
|
+ //if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) {
|
||||||
|
const bool kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
|
||||||
|
|| (dq_cur->sLayerInfo.sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR);
|
||||||
|
// Subclause 8.2.5.2 Decoding process for gaps in frame_num
|
||||||
41
patches/x264_log2f_fix.patch
Normal file
41
patches/x264_log2f_fix.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
diff -urN submodules/externals/x264/common/osdep.h.orig submodules/externals/x264/common/osdep.h
|
||||||
|
--- submodules/externals/x264/common/osdep.h.orig 2014-02-06 13:56:59.243663951 +0100
|
||||||
|
+++ submodules/externals/x264/common/osdep.h 2014-02-06 13:57:17.215685078 +0100
|
||||||
|
@@ -35,11 +35,6 @@
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
-#if !HAVE_LOG2F
|
||||||
|
-#define log2f(x) (logf(x)/0.693147180559945f)
|
||||||
|
-#define log2(x) (log(x)/0.693147180559945)
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <io.h> // _setmode()
|
||||||
|
#include <fcntl.h> // _O_BINARY
|
||||||
|
@@ -55,6 +60,11 @@
|
||||||
|
#include <math.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !HAVE_LOG2F
|
||||||
|
+#define log2f(x) (logf(x)/0.693147180559945f)
|
||||||
|
+#define log2(x) (log(x)/0.693147180559945)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#if (defined(__GNUC__) || defined(__INTEL_COMPILER)) && (ARCH_X86 || ARCH_X86_64)
|
||||||
|
#define HAVE_X86_INLINE_ASM 1
|
||||||
|
#endif
|
||||||
|
diff -urN submodules/externals/x264/configure.orig submodules/externals/x264/configure
|
||||||
|
--- submodules/externals/x264/configure.orig 2014-02-06 13:56:59.231663937 +0100
|
||||||
|
+++ submodules/externals/x264/configure 2014-02-06 13:57:17.219685083 +0100
|
||||||
|
@@ -816,10 +816,6 @@
|
||||||
|
fi
|
||||||
|
[ "$thread" != "no" ] && define HAVE_THREAD
|
||||||
|
|
||||||
|
-if cc_check "math.h" "-Werror" "return log2f(2);" ; then
|
||||||
|
- define HAVE_LOG2F
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
if [ "$vis" = "yes" ] ; then
|
||||||
|
save_CFLAGS="$CFLAGS"
|
||||||
|
CFLAGS="$CFLAGS -I/usr/X11R6/include"
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
# This file is automatically generated by Android Tools.
|
|
||||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
||||||
#
|
|
||||||
# This file must be checked in Version Control Systems.
|
|
||||||
#
|
|
||||||
# To customize properties used by the Ant build system edit
|
|
||||||
# "ant.properties", and override values to adapt the script to your
|
|
||||||
# project structure.
|
|
||||||
#
|
|
||||||
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
|
|
||||||
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
|
||||||
|
|
||||||
# Project target.
|
|
||||||
target=android-17
|
|
||||||
android.library=false
|
|
||||||
13
release.patch
Normal file
13
release.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
|
||||||
|
index 5ef1374..86e13be 100644
|
||||||
|
--- a/AndroidManifest.xml
|
||||||
|
+++ b/AndroidManifest.xml
|
||||||
|
@@ -45,7 +45,7 @@
|
||||||
|
|
||||||
|
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
|
||||||
|
|
||||||
|
- <application android:label="@string/app_name" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true" android:allowBackup="true">
|
||||||
|
+ <application android:label="@string/app_name" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true" android:allowBackup="true" android:debuggable="false">
|
||||||
|
|
||||||
|
<activity android:name="org.linphone.LinphoneLauncherActivity"
|
||||||
|
android:label="@string/app_name"
|
||||||
5
res/color/edittextcolor.xml
Normal file
5
res/color/edittextcolor.xml
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:state_enabled="false" android:color="@android:color/darker_gray" />
|
||||||
|
<item android:color="@android:color/black"/>
|
||||||
|
</selector>
|
||||||
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 7 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 6 KiB After Width: | Height: | Size: 6 KiB |
|
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 9 KiB After Width: | Height: | Size: 9 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 5 KiB After Width: | Height: | Size: 5 KiB |
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue