From 35918326f004267954e26fe8a6cb38b73b197d97 Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Fri, 27 Sep 2024 01:43:03 +0200 Subject: [PATCH] android: fix apkanalyzer location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fix SDK location: our install has 2 different versions: under `tools/bin/apkanalyzer` and `cmdline-tools/latest/bin/apkanalyzer`, but only the later is functional (trying to use the former raise some classpath exceptions) - always use the SDK location, don't try to detect it: it's better to fail with a more explanatory "apkanalyzer: command not found" error than having the shell try to run a command with the wrong executable (`manifest …` because `$(APKANALYZER)` is empty) --- make/android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/android.mk b/make/android.mk index 83e1f2084..40b87e3f3 100644 --- a/make/android.mk +++ b/make/android.mk @@ -8,7 +8,7 @@ ANDROID_APK = koreader-android-$(ANDROID_ARCH)$(KODEDUG_SUFFIX)-$(ANDROID_NAME). PHONY += run # Tools -APKANALYZER ?= $(word 1,$(wildcard $(shell command -v apkanalyzer) $(ANDROID_SDK_ROOT)/tools/bin/apkanalyzer)) +APKANALYZER ?= $(ANDROID_SDK_ROOT)/cmdline-tools/latest/bin/apkanalyzer run: update # get android app id