update readme

Change-Id: I4d5b2476e22ae9079eabb12012a48d75e308d66d

README

@@ -59,6 +59,17 @@ https://www.savoirfairelinux.com/
 How to compile on Linux
 -----------------------
 
+A) With CMake
+
+mkdir build
+cd build
+cmake .. -DJAMI_DBUS=On
+make -j4
+
+This should build the 'contrib' dependencies, then the daemon
+
+B) With Meson
+
 1) Compile the dependencies first
 
 cd contrib
@@ -67,9 +78,27 @@ cd native
 ../bootstrap
 make
 
-2) Then the jamid application
+2) Then the jamid application and/or libjami library
+
+cd ../../
+mkdir build
+export PATH=$PATH:`pwd`/contrib/`cc -dumpmachine`/bin
+meson -Dpkg_config_path=`pwd`/contrib/`cc -dumpmachine`/lib/pkgconfig -Ddefault_library=static -Dinterfaces=dbus build
+cd build
+ninja
+ninja install
+
+C) With Autotools
+
+1) Compile the dependencies first
+
+cd contrib
+mkdir native
+cd native
+../bootstrap
+make
 
-A) With Autotools (recommended)
+2) Then the jamid application and/or libjami library
 
 cd ../..
 ./autogen.sh
@@ -77,30 +106,27 @@ cd ../..
 make
 make install
 
-B) With Meson
+How to compile the daemon for Android (on a Linux or macOS host)
+-----------------------------------
+
+A) With CMake
 
-cd ../../
 mkdir build
-export PATH=$PATH:`pwd`/contrib/`cc -dumpmachine`/bin
-meson -Dpkg_config_path=`pwd`/contrib/`cc -dumpmachine`/lib/pkgconfig -Ddefault_library=static -Dinterfaces=dbus build
 cd build
-ninja
-ninja install
-
-Done !
+cmake .. -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_API=24 -DBUILD_EXTRA_TOOLS=On -DJAMI_JNI=On -DJAMI_JNI_PACKAGEDIR=java
+make -j4
 
-Note:
-If you don't want SHM to be used, you can build with `--without-dbus`
+Replace arm64-v8a with the desired target ABI.
+See the README in jami-client-android for instructions to build the Jami client for Android.
 
-How to compile on Linux for Android
------------------------------------
+B) With Meson
 
 1) Download and install Android NDK
 2) Compile the dependencies
 
 export ANDROID_NDK=<NDK>
 export ANDROID_ABI=arm64-v8a
-export ANDROID_API=29
+export ANDROID_API=24
 export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64
 export TARGET=aarch64-linux-android
 export CC=$TOOLCHAIN/bin/$TARGET$ANDROID_API-clang
@@ -170,7 +196,6 @@ docker build --tag jami-daemon .
 docker build --tag jami-daemon --build-arg config_args="--with-nodejs" .
 ```
 
-
 Common Issues
 -------------
 
@@ -190,15 +215,6 @@ interaction between daemon and client will not work; for each platform where
 D-Bus is not available the client should implement all the methods in the
 *_stub.cpp files.
 
-
-SIP accounts
----------------------
-
-You may register an existing SIP account through the account wizard in both
-clients (KDE and GNOME).
-By doing this, you will be able to call other accounts known to this server.
-
-
 Contributing to Jami
 ------------------------