diff --git a/Makefile b/Makefile index 78f6ce9fa..a987e64cf 100644 --- a/Makefile +++ b/Makefile @@ -554,8 +554,7 @@ veryclean: clean clean-ffmpeg clean-x264 clean-openh264 clean-vpx clean-matroska .PHONY: clean install-apk run-linphone -generate-sdk: generate-apk - ant liblinphone-android-sdk +generate-sdk: liblinphone-android-sdk liblinphone-android-sdk: generate-apk ant liblinphone-android-sdk diff --git a/README b/README index 53354ee1f..6dcd6e42a 100644 --- a/README +++ b/README @@ -12,10 +12,10 @@ To build liblinphone for Android, you must: 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. $ 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 5) (Optional) To generate a liblinphone SDK zip containing a full jar and native libraries, run - $ make linphone-sdk + $ 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 diff --git a/submodules/belle-sip b/submodules/belle-sip index c5129013f..0837e201b 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit c5129013f5b59ebbe269270de79f9f7d173d6edc +Subproject commit 0837e201b8add7b91c149e701a2b637d6c1da74a diff --git a/submodules/linphone b/submodules/linphone index c8bd7e100..9cdd062f4 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c8bd7e1007c466d5f244c0e82e8d8e5ebb563c2f +Subproject commit 9cdd062f48b16232dea32b8c4f94d079c9912c1c