From 0e1d7d643081929338ba7cc7c5f85736ac632e92 Mon Sep 17 00:00:00 2001 From: branlix3000 <49960858+branlix3000@users.noreply.github.com> Date: Sun, 31 May 2020 19:18:33 +0000 Subject: [PATCH] Fixing Android build from Linux. Letting ANDROID_NDK to be modified at compile time. Default path to the ANDROID_TOOLCHAIN have changed in the latest Android command-line tools release. (#1264) Co-authored-by: Branlix 3000 --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 98489293c..be51dd736 100644 --- a/src/Makefile +++ b/src/Makefile @@ -168,8 +168,8 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) ANDROID_NDK = C:/android-ndk-r21 ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64 else - ANDROID_NDK = /usr/lib/android/ndk - ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux + ANDROID_NDK ?= /usr/lib/android/ndk + ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64 endif ifeq ($(ANDROID_ARCH),ARM)