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

Merge branch 'bellesip' of git.linphone.org:linphone-android-private into bellesip

Browse source
This commit is contained in:
Jehan Monnier 2013-03-13 13:44:37 +01:00
commit 1b5175862c
4 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -121,16 +121,20 @@ prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-sr
LIBLINPHONE_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) LIBLINPHONE_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)
generate-libs: prepare-sources generate-libs: prepare-sources javah
$(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) $(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS)
update-project: update-project:
$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET) $(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
$(SDK_PATH)/android update project --path liblinphone_tester --target $(ANDROID_MOST_RECENT_TARGET)
liblinphone_tester: prepare-sources prepare-cunit prepare-liblinphone_tester liblinphone_tester: prepare-sources prepare-cunit prepare-liblinphone_tester javah
$(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) NDK_DEBUG=1 -j$(NUMCPUS) $(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) NDK_DEBUG=1 -j$(NUMCPUS)
generate-apk: javah:
ant javah
generate-apk: generate-libs
ant partial-clean ant partial-clean
echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties
ant debug ant debug

11
custom_rules.xml
View file

@ -17,7 +17,7 @@
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>
@ -56,15 +56,6 @@
<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

1
liblinphone_tester/ant.properties Normal file
View file

@ -0,0 +1 @@
source.dir=src:../submodules/linphone/mediastreamer2/java/src

2
liblinphone_tester/src/org/linphone/tester/TestRunner.java
View file

@ -23,7 +23,6 @@ public class TestRunner extends InstrumentationTestRunner {
return suite; return suite;
} }
public static void addSuites(TestSuite suite, String suiteCheck, String testCheck) { public static void addSuites(TestSuite suite, String suiteCheck, String testCheck) {
TesterList testerList = new TesterList(); TesterList testerList = new TesterList();
testerList.run(new String[]{"tester", "--list-suites"}); testerList.run(new String[]{"tester", "--list-suites"});
@ -34,6 +33,7 @@ public class TestRunner extends InstrumentationTestRunner {
} }
} }
} }
public static void addSuite(TestSuite suite, String suiteStr, String testCheck) { public static void addSuite(TestSuite suite, String suiteStr, String testCheck) {
TesterList testerList = new TesterList(); TesterList testerList = new TesterList();
testerList.run(new String[]{"tester", "--list-tests", suiteStr}); testerList.run(new String[]{"tester", "--list-tests", suiteStr});