Allow compilaion with NDK10
Also replace make fetch with make install
Refs: #51791
diff --git a/compile.sh b/compile.sh
index 917283a..264626b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -37,7 +37,7 @@
# try to detect NDK version
REL=$(grep -o '^r[0-9]*.*' $ANDROID_NDK/RELEASE.TXT 2>/dev/null|cut -b2-)
case "$REL" in
- 9*)
+ 9|10|*)
GCCVER=4.8
CXXSTL="/"${GCCVER}
;;
@@ -209,8 +209,6 @@
cd contrib/contrib-android-${TARGET_TUPLE}
../bootstrap --host=${TARGET_TUPLE}
-# TODO: mpeg2, theora
-
# Some libraries have arm assembly which won't build in thumb mode
# We append -marm to the CFLAGS of these libs to disable thumb mode
[ ${ANDROID_ABI} = "armeabi-v7a" ] && echo "NOTHUMB := -marm" >> config.mak
@@ -229,7 +227,7 @@
echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak
export SFLPHONE_EXTRA_CFLAGS="${EXTRA_CFLAGS}"
-make fetch
+make install
# We already have zlib available
[ -e .zlib ] || (mkdir -p zlib; touch .zlib)
which autopoint >/dev/null || make $MAKEFLAGS .gettext