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

Make latest ZRTP a git submodule

Browse source
This commit is contained in:
Guillaume Beraudo 2011-10-12 14:48:52 +02:00
parent ca77d59885
commit a01a2c982a
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -40,3 +40,6 @@
[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 = http://git.chromium.org/webm/libvpx.git
[submodule "submodules/externals/libzrtpcpp"]
path = submodules/externals/libzrtpcpp
url = git://github.com/wernerd/ZRTPCPP.git

5
README
View file

@ -3,7 +3,7 @@
To build liblinphone for Android, you must: To build liblinphone for Android, you must:
1) download the Android ndk (>=r5c) from google. 1) download the Android ndk (>=r5c) from google.
2) install the autotools: autoconf, automake, aclocal, libtoolize 2) install the autotools: autoconf, automake, aclocal, libtoolize and cmake
3) run the ./prepare_sources.sh script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project. 3) run the ./prepare_sources.sh script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project.
$ ./prepare_sources.sh $ ./prepare_sources.sh
@ -14,9 +14,10 @@ To build liblinphone for Android, you must:
Some options can be passed to ndk-build, like "ndk-build SOME_OPTION=SOME_VALUE" Some options can be passed to ndk-build, like "ndk-build SOME_OPTION=SOME_VALUE"
Option Name | Possible values Option Name | Possible values
---------------------------------------- ---------------------------------------------------------------------------------
BUILD_X264 0 (don't build x264) or 1 (build x264) BUILD_X264 0 (don't build x264) or 1 (build x264)
BUILD_AMR 0 (don't build amr codec), light (try to use amr codec from android), full (build your own amr codec) BUILD_AMR 0 (don't build amr codec), light (try to use amr codec from android), full (build your own amr codec)
BUILD_GPLV3_ZRTP 0 (don't support ZRTP), 1 (support ZRTP and make the whole program GPLv3)

3
prepare_sources.sh
View file

@ -14,4 +14,5 @@ cd submodules/libilbc-rfc3951 && ./autogen.sh && ./configure && make || ( echo "
cd $topdir/submodules/externals/build/libvpx && ./asm_conversion.sh && cp *.asm *.h ../../libvpx/ || ( echo "VP8 prepare stage failed." ; exit 1 ) cd $topdir/submodules/externals/build/libvpx && ./asm_conversion.sh && cp *.asm *.h ../../libvpx/ || ( echo "VP8 prepare stage failed." ; exit 1 )
echo Preparing ZRTP (need cmake installed)
cmake -Denable-ccrtp=false submodules/externals/libzrtpcpp

2
submodules/externals/build/libzrtpcpp/Android.mk vendored
View file

@ -26,6 +26,8 @@ LOCAL_SRC_FILES := \
src/ZrtpPacketHello.cpp \ src/ZrtpPacketHello.cpp \
src/ZrtpPacketPingAck.cpp \ src/ZrtpPacketPingAck.cpp \
src/ZrtpPacketPing.cpp \ src/ZrtpPacketPing.cpp \
src/ZrtpPacketRelayAck.cpp \
src/ZrtpPacketSASrelay.cpp \
src/ZrtpStateClass.cpp \ src/ZrtpStateClass.cpp \
src/ZrtpTextData.cpp src/ZrtpTextData.cpp

1
submodules/externals/libzrtpcpp vendored Submodule

@ -0,0 +1 @@
Subproject commit 93dbdb3159f55bb35f69c13df1f60ac4901c88fb