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

Fall back to ANDROID_NDK if NDK not set (#3064)

Browse Source 
* Fall back to ANDROID_NDK if NDK not set
This commit is contained in:
Marcin Mielniczuk
2017-08-11 17:28:54 +02:00
committed by Frans de Jonge
parent 8073a1d12f
commit 128d60a6d3
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kodev
View File

@@ -94,7 +94,14 @@ ${SUPPORTED_TARGETS}"
assert_ret_zero $?
;;
android)
[[ -n ${NDK+x} ]] || export NDK="${CURDIR}/base/toolchain/android-ndk-r12b"
if [ -z "${NDK+x}" ]; then
if [ -n "${ANDROID_NDK+x}" ]; then
# some distributions use `ANDROID_NDK` instead, fall back to it
export NDK="${ANDROID_NDK}"
else
export NDK="${CURDIR}/base/toolchain/android-ndk-r12b"
fi
fi
[ -e "${CURDIR}/base/toolchain/android-toolchain/bin/arm-linux-androideabi-gcc" ] || {
{ [ -e "${NDK}" ] || make -C "${CURDIR}/base/toolchain" android-ndk; }
make android-toolchain