From 8791419f8eb37c00da363797c193a4e4e966da07 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sun, 4 Aug 2024 10:21:04 -0400 Subject: [PATCH] Sort better, and actually use ndk r26d. --- GNUmakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 03d395f8..48e81499 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -72,7 +72,7 @@ ANDROID_MIN_SDK_VERSION := 24 ANDROID_TARGET_SDK_VERSION := 34 ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-$(ANDROID_TARGET_SDK_VERSION) -ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.2.11394342 +ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.3.11579264 ANDROID_ARMV7A_TARGETS := \ out/androiddebug-armv7a/tildefriends \ @@ -736,7 +736,7 @@ PACKAGE_DIRS := \ deps/prettier/ \ deps/lit/ -RAW_FILES := $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f | sort)) +RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f))) out/apk/TildeFriends-arm-debug.unsigned.apk: BUILD_TYPE := debug out/apk/TildeFriends-arm-release.unsigned.apk: BUILD_TYPE := release @@ -846,7 +846,7 @@ out/apk/TildeFriends-%.fdroid.unsigned.apk: @cd out/apk-fdroid-$(BUILD_TYPE) && zip -X -u ../../$@.zip -q lib/*/libtildefriends.so && cd ../../ @mkdir out/apk-fdroid-$(BUILD_TYPE)-raw @for i in $(RAW_FILES); do mkdir -p $$(dirname out/apk-fdroid-$(BUILD_TYPE)-raw/$$i) && cp $$i out/apk-fdroid-$(BUILD_TYPE)-raw/$$i && touch -d @0 out/apk-fdroid-$(BUILD_TYPE)-raw/$$i; done - @cd out/apk-fdroid-$(BUILD_TYPE)-raw && zip -X -u ../../$@.zip -q $$(find . -type f | sort) && cd ../../ + @cd out/apk-fdroid-$(BUILD_TYPE)-raw && zip -X -u ../../$@.zip -q $(RAW_FILES) && cd ../../ @$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@ out/%.apk: out/apk/%.unsigned.apk