README: update build instructions
diff --git a/README b/README
index 5d515c3..d940da7 100644
--- a/README
+++ b/README
@@ -7,6 +7,7 @@
You have also to make sure that the following environment variables are defined:
export ANDROID_NDK=$HOME/path/to/android-ndk-r*b
+export ANDROID_NDK_ROOT=$ANDROID_NDK
export ANDROID_SDK=$HOME/path/to/android-sdk-linux
The path to the required Android's build executable must be also specified:
@@ -23,25 +24,22 @@
jni/sflphone/daemon/src/JavaJNI2CJNI_Load.py
make-swig.sh
-Compile pjsip-android
-$ pushd jni/pjproject-android/
-$ make realclean
-$ TARGET_ABI=armeabi-v7a ./configure-android-patched --use-ndk-cflags --disable-sound --disable-oss --disable-video --enable-ext-sound --disable-speex-aec --disable-g711-codec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-sdl --disable-ffmpeg --disable-v4l2
-$ make dep && make
-$ popd
-
-Configure deamon for Android
-$ pushd jni/sflphone/daemon/
-$ ./configure-android.sh
-$ popd
-
-Generate dbus interface
+Generate swig interface
$ ./make-swig.sh
-$ pushd jni/
-$ ndk-build APP_ABI=armeabi-v7a -j4
+Configure daemon for Android
+$ pushd jni/sflphone/daemon
+$ ./configure-android.sh
+
+Compile pjsip (-a is for android compilation)
+$ cd libs
+$ ./compile-pjsip.sh -a
$ popd
+Build modules
+$ cd jni
+$ ndk-build -j4
+
Check that no errors occurred. In particular, following files should have been generated by make-swig.sh:
sflphoneservice_loader.c
callmanager_wrap.cpp
@@ -66,21 +64,6 @@
- Can be integrated in jenkins as well
- Offers 20+ different devices
-Cons:
- - Not actually a negative point, but as it is based on VirtualBox, these Vms needs x86 images to run. SFLphone is only built for arm arch, and needs to be recompiled for x86.
- This concerns only the JNI part of the project.
-
- Android provides an option APP_ABI parameter, defining for which arch it is built (it can be more than one at the same time)
-
- Issue: Pjsip uses a custom build system, and does not support parallel builds. So each time you want to switch arm/x86, pjsip needs to be recompiled using
-
- $ make realclean
- $ TARGET_ABI=INSERT_ARCH_HERE ./configure-android-patched --use-ndk-cflags --disable-sound --disable-oss --disable-video --enable-ext-sound --disable-speex-aec --disable-g711-codec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-sdl --disable-ffmpeg --disable-v4l2
-
- And don't forget to rebuild the rest of the JNI project with:
- $ ndk-build APP_ABI=INSERT_ARCH_HERE -j4
-
-
Notes:
- Using SFLphone on VMs: