From 25d29aca4adbe8f88ed375936f676fe1e9441ff3 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 14 May 2024 08:30:15 +0000
Subject: [PATCH] android: fix building with kodev (#11817)

If the Android NDK and/or SDK are not setup, `kodev` will try to invoke
the `android-ndk` and/or `android-sdk` make targets.  This can't be done
with `TARGET=android`, as `base/Makefile.defs` will error out trying to
call the (missing) compiler to get the target machine. Those rules need
to be available to all targets.
---
 Makefile        | 8 +++++++-
 make/android.mk | 8 +-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a6c39794a..c537f426c 100644
--- a/Makefile
+++ b/Makefile
@@ -180,6 +180,12 @@ ifneq (,$(wildcard make/$(TARGET).mk))
   include make/$(TARGET).mk
 endif
 
+android-ndk:
+	$(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_NDK_HOME)
+
+android-sdk:
+	$(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_HOME)
+
 # for gettext
 DOMAIN=koreader
 TEMPLATE_DIR=l10n/templates
@@ -210,4 +216,4 @@ static-check:
 doc:
 	make -C doc
 
-.PHONY: all base clean doc test
+.PHONY: all android-ndk android-sdk base clean doc test
diff --git a/make/android.mk b/make/android.mk
index 0dcc1f394..b27cc852b 100644
--- a/make/android.mk
+++ b/make/android.mk
@@ -4,12 +4,6 @@ ANDROID_ASSETS = $(ANDROID_LAUNCHER_DIR)/assets/module
 ANDROID_LIBS_ROOT = $(ANDROID_LAUNCHER_DIR)/libs
 ANDROID_LIBS_ABI = $(ANDROID_LIBS_ROOT)/$(ANDROID_ABI)
 
-android-ndk:
-	$(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_NDK_HOME)
-
-android-sdk:
-	$(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_HOME)
-
 androiddev: update
 	$(MAKE) -C $(ANDROID_LAUNCHER_DIR) dev
 
@@ -70,4 +64,4 @@ update: all
 	cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity.apk \
 		koreader-android-$(ANDROID_ARCH)$(KODEDUG_SUFFIX)-$(VERSION).apk
 
-.PHONY: android-ndk android-sdk androiddev update
+.PHONY: androiddev update