yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 17:59:39 +02:00
Code Issues Releases Wiki Activity

ndk-make.sh: error out if ANDROID_NDK_ROOT is not set

Browse source
This commit is contained in:
link2xt 2022-07-30 17:38:25 +00:00
parent 15d9b444de
commit e18c08bc97
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ndk-make.sh
View file

@ -36,7 +36,11 @@ echo "starting time: `date`"
: "${ANDROID_NDK_ROOT:=$ANDROID_NDK_HOME}" : "${ANDROID_NDK_ROOT:=$ANDROID_NDK_HOME}"
: "${ANDROID_NDK_ROOT:=$ANDROID_NDK}" : "${ANDROID_NDK_ROOT:=$ANDROID_NDK}"
if test ! -z "$ANDROID_NDK_ROOT"; then if test -z "$ANDROID_NDK_ROOT"; then
echo "ANDROID_NDK_ROOT is not set"
exit 1
fi
echo Setting CARGO_TARGET environment variables. echo Setting CARGO_TARGET environment variables.
if test -z "$NDK_HOST_TAG"; then if test -z "$NDK_HOST_TAG"; then
@ -50,7 +54,6 @@ if test ! -z "$ANDROID_NDK_ROOT"; then
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-clang" export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-clang"
export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang" export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang"
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang" export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang"
fi
# Check if the argument is a correct architecture: # Check if the argument is a correct architecture:
if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then