averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

android: update to use NDK 23c

Browse Source
This commit is contained in:
Benoit Pierre
2023-07-10 19:47:45 +02:00
committed by Frans de Jonge
parent ded5558b88
commit 3ac8a67c6d
4 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
kodev
View File

@@ -20,15 +20,6 @@ fi
# Default Android build to arm.
ANDROID_ARCH="${ANDROID_ARCH:-arm}"
# Default to Android 4.0+; required for NDK 15 but with a custom NDK the strict minimum is 9.
if [[ "${ANDROID_ARCH}" == "arm64" ]] || [[ "${ANDROID_ARCH}" == "x86_64" ]]; then
# 64bit arches require at least ABI 21
NDKABI="${NDKABI:-21}"
else
NDKABI="${NDKABI:-14}"
fi
export NDKABI
# Default android flavor
ANDROID_FLAVOR="${ANDROID_FLAVOR:-rocks}"
export ANDROID_FLAVOR
@@ -264,21 +255,7 @@ ${SUPPORTED_TARGETS}"
assert_ret_zero $?
;;
android)
if [ -z "${NDK}" ]; then
if [ -n "${ANDROID_NDK_HOME}" ]; then
# some distributions use `ANDROID_NDK` instead, fall back to it
export NDK="${ANDROID_NDK_HOME}"
else
export NDK="${CURDIR}/base/toolchain/android-ndk-r15c"
fi
fi
[ -e "${CURDIR}/base/toolchain/android-toolchain-${ANDROID_ARCH}/bin/" ] || {
{ [ -e "${NDK}" ] || make -C "${CURDIR}/base/toolchain" android-ndk; }
assert_ret_zero $?
make android-toolchain
assert_ret_zero $?
}
echo "Using NDK: ${NDK}..."
make android-ndk || exit $?
make TARGET=android
assert_ret_zero $?
;;
@@ -550,14 +527,8 @@ ${SUPPORTED_RELEASE_TARGETS}"
make TARGET=kindle-legacy update
;;
android)
make android-sdk || exit $?
kodev-build android
export PATH=${PATH}:${CURDIR}/base/toolchain/android-sdk-linux/tools
command -v android &>/dev/null || {
make -C "${CURDIR}/base/toolchain" android-sdk
}
ANDROID_HOME=$(dirname "$(dirname "$(command -v android)")")
export ANDROID_HOME
export PATH="${PATH}:${NDK}"
make TARGET=android update
;;
pocketbook)