summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-04-12 23:17:45 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-04-13 16:51:58 +0200
commitcfc02cadcc65d74b17f15e5621c42a53467f6d04 (patch)
tree36344da9d65b230e4c723935d9fdf94c562ffd66 /android
parentb1d7d897d3b5317af94b3fcf753953f536eea8d6 (diff)
downloadrockbox-cfc02cadcc65d74b17f15e5621c42a53467f6d04.tar.gz
rockbox-cfc02cadcc65d74b17f15e5621c42a53467f6d04.tar.bz2
rockbox-cfc02cadcc65d74b17f15e5621c42a53467f6d04.zip
android: Fix configure script for "newer" versions of the NDK
The oldest verison of the NDK one can still download today is version 10e from mid-2015, which comes with GCC 4.9, and no longer supports 32-bit hosts. With this, one can actually compile the iBasso DX50/DX90 targets again, as well as the generic android target, as long as one has the correct SDK platforms (v16 for ibasso, v19 for generic) and SDK tools installed. Change-Id: I62f2e742d5cfc13133244aeff75a928a7294ac91
Diffstat (limited to 'android')
-rw-r--r--android/android.make6
1 files changed, 4 insertions, 2 deletions
diff --git a/android/android.make b/android/android.make
index b36943b673..9e50e6ce70 100644
--- a/android/android.make
+++ b/android/android.make
@@ -28,11 +28,13 @@ $(CPUFEAT_BUILD)/cpu-features.o: $(CPUFEAT)/cpu-features.c
.PHONY: apk classes clean dex dirs libs jar
# API version
-ANDROID_PLATFORM_VERSION=19
+#ANDROID_PLATFORM_VERSION=19 # Set by configure script
ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION)
+# Use oldest version available..
+BUILD_TOOLS_VERSION=$(notdir $(firstword $(wildcard $(ANDROID_SDK_PATH)/build-tools/*)))
+
# android tools
-BUILD_TOOLS_VERSION=$(notdir $(firstword $(wildcard $(ANDROID_SDK_PATH)/build-tools/$(ANDROID_PLATFORM_VERSION).*)))
AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt
DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx
ifneq ("$(wildcard $(ANDROID_SDK_PATH)/tools/zipalign)","")