commit d51365a19109f4a1ca05cb9b12e690d4c4f3c796 parent 57e8dbf92e8b38ff31f129975489f82154f5ec46 Author: Iván Ávalos <avalos@disroot.org> Date: Wed, 22 Apr 2026 11:25:23 +0200 fix Android Meson build Diffstat:
| M | cross/build-android.sh | | | 2 | +- |
| M | cross/package-android.sh | | | 4 | ++-- |
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cross/build-android.sh b/cross/build-android.sh @@ -72,7 +72,7 @@ CROSSFILE=cross/android-$ABI.cross.txt cat > $CROSSFILE <<EOF [binaries] c = '$CLANG_NAME-clang' -cmake = 'false' +cmake = 'cmake' ar = 'llvm-ar' as = '$TOOLS_NAME-as' ranlib = '$TOOLS_NAME-ranlib' diff --git a/cross/package-android.sh b/cross/package-android.sh @@ -26,8 +26,8 @@ export PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin" export ANDROID_SDK_ROOT="${ANDROID_HOME}" export ANDROID_NDK_HOME="${ANDROID_HOME}/ndk/${NDK_VERSION}" -# Install NDK version if it doesn't exist -if [ ! -d "$ANDROID_SDK_ROOT/ndk/$NDK_VERSION" ]; then +# install NDK version if it doesn't exist +if ! sdkmanager --list_installed | grep -q "ndk;$NDK_VERSION"; then sdkmanager "ndk;$NDK_VERSION" fi