From 4981506f373bca1c947a3a2a9b200a2cdf014d1b Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 12 Mar 2013 16:37:12 +0100 Subject: [PATCH 1/4] Fix makefile for liblinphone_tester (javah) --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4b2cec29c..6f97c8d47 100644 --- a/Makefile +++ b/Makefile @@ -128,6 +128,7 @@ update-project: $(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET) liblinphone_tester: prepare-sources prepare-cunit prepare-liblinphone_tester + ant javah $(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) NDK_DEBUG=1 -j$(NUMCPUS) generate-apk: @@ -141,7 +142,7 @@ install-apk: release: update-project ant clean echo "What is the version name for the release ?"; \ - read version; \ + read version; \ echo "version.name=$$version" > default.properties ant release From 3f78919820cef358a8f2280253f3a9fbe7dc8099 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 13 Mar 2013 09:31:42 +0100 Subject: [PATCH 2/4] Add liblinphone_tester to update project --- Makefile | 1 + liblinphone_tester/src/org/linphone/tester/TestRunner.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f97c8d47..d55f8402e 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,7 @@ generate-libs: prepare-sources update-project: $(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 ant javah diff --git a/liblinphone_tester/src/org/linphone/tester/TestRunner.java b/liblinphone_tester/src/org/linphone/tester/TestRunner.java index ab928c6b1..cfa36f636 100644 --- a/liblinphone_tester/src/org/linphone/tester/TestRunner.java +++ b/liblinphone_tester/src/org/linphone/tester/TestRunner.java @@ -23,7 +23,6 @@ public class TestRunner extends InstrumentationTestRunner { return suite; } - public static void addSuites(TestSuite suite, String suiteCheck, String testCheck) { TesterList testerList = new TesterList(); 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) { TesterList testerList = new TesterList(); testerList.run(new String[]{"tester", "--list-tests", suiteStr}); From f4c07d3467ce2d9869ee418f332f5370392912f8 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 13 Mar 2013 11:36:15 +0100 Subject: [PATCH 3/4] Improve makefile and ant script --- Makefile | 10 ++++++---- custom_rules.xml | 11 +---------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index d55f8402e..dfa2c8a61 100644 --- a/Makefile +++ b/Makefile @@ -121,18 +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) -generate-libs: prepare-sources +generate-libs: prepare-sources javah $(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) update-project: $(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 - ant javah +liblinphone_tester: prepare-sources prepare-cunit prepare-liblinphone_tester javah $(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 echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties ant debug diff --git a/custom_rules.xml b/custom_rules.xml index fdecf9fbb..5ddacc5b0 100644 --- a/custom_rules.xml +++ b/custom_rules.xml @@ -17,7 +17,7 @@ failonerror="false" /> - + Generate JNI header @@ -56,15 +56,6 @@ - - - - - - - - - Generate Javadoc Date: Wed, 13 Mar 2013 12:56:03 +0100 Subject: [PATCH 4/4] Add ant properties for liblinphone_tester --- liblinphone_tester/ant.properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 liblinphone_tester/ant.properties diff --git a/liblinphone_tester/ant.properties b/liblinphone_tester/ant.properties new file mode 100644 index 000000000..9c05ba1c8 --- /dev/null +++ b/liblinphone_tester/ant.properties @@ -0,0 +1 @@ +source.dir=src:../submodules/linphone/mediastreamer2/java/src