build: adapt for Android NDK r25

Change-Id: Id52bc4ebee89d5779e153be8d5e6678527dc7cfc

build-daemon.sh

@@ -13,7 +13,8 @@ if [ -z "$ANDROID_ABI" ]; then
 fi
 
 platform=$(echo "`uname`" | tr '[:upper:]' '[:lower:]')
-arch=`uname -m`
+arch='x86_64'
+#arch=`uname -m`
 
 ANDROID_TOPLEVEL_DIR="`pwd`"
 ANDROID_APP_DIR="${ANDROID_TOPLEVEL_DIR}/ring-android"
@@ -89,7 +90,7 @@ PACKAGEDIR=$ANDROID_APP_DIR/libjamiclient/src/main/java/net/jami/daemon $JNIDIR/
 
 # Setup cross-compilation build environemnt
 export AR=$TOOLCHAIN/bin/llvm-ar
-export AS=$TOOLCHAIN/bin/$TARGET-as
+export AS="$TOOLCHAIN/bin/$TARGET_CC$API-clang -c"
 export CC=$TOOLCHAIN/bin/$TARGET_CC$API-clang
 export CXX=$TOOLCHAIN/bin/$TARGET_CC$API-clang++
 export LD=$TOOLCHAIN/bin/ld
@@ -185,7 +186,8 @@ STATIC_LIBS_ALL="-llog -lOpenSLES -landroid \
 
 LIBRING_JNI_DIR=${ANDROID_APP_DIR}/app/src/main/libs/${ANDROID_ABI}
 LIBRING_JNI_UNSTRIPPED_DIR=${ANDROID_APP_DIR}/unstripped/${ANDROID_ABI}
-LIBCPP=$ANDROID_NDK/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so
+#LIBCPP=$ANDROID_NDK/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so
+LIBCPP=$TOOLCHAIN/sysroot/usr/lib/$TARGET/libc++_shared.so
 
 echo "Building Jami JNI library for Android to ${LIBRING_JNI_DIR}"
 mkdir -p ${LIBRING_JNI_DIR}

docker/Dockerfile

@@ -70,9 +70,9 @@ RUN (while sleep 1; do echo "y"; done) | sdkmanager --channel=1 --sdk_root=${AND
 	'platforms;android-32'\
 	'extras;android;m2repository'\
 	'extras;google;m2repository'\
-	'ndk;23.2.8568313'
+	'ndk;25.0.8775105'
 ENV ANDROID_SDK=${ANDROID_HOME}
-ENV ANDROID_NDK=${ANDROID_HOME}/ndk/23.2.8568313
+ENV ANDROID_NDK=${ANDROID_HOME}/ndk/25.0.8775105
 
 # Fastlane
 RUN gem install fastlane -NV

ring-android/app/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 android {
     compileSdk = 32
     buildToolsVersion = "32.0.0"
-    ndkVersion = "23.2.8568313"
+    ndkVersion = "25.0.8528842"
     defaultConfig {
         minSdk = 21
         targetSdk = 32