From c2e2ba2a40e00355fe12e094ce47afe5dd6e9633 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Fri, 29 Sep 2023 00:32:22 +0000 Subject: [PATCH] Actually include the 32-bit executables. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4482 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6e2637fd..63e5ed2b 100644 --- a/Makefile +++ b/Makefile @@ -514,16 +514,20 @@ RAW_FILES := $(shell find $(PACKAGE_DIRS) -type f) out/apk/TildeFriends-debug.unsigned.apk: BUILD_TYPE := debug out/apk/TildeFriends-release.unsigned.apk: BUILD_TYPE := release -out/apk/TildeFriends-debug.unsigned.apk: out/apk/classes.dex out/androiddebug/tildefriends out/androiddebug-x86_64/tildefriends $(RAW_FILES) out/apk/res.apk -out/apk/TildeFriends-release.unsigned.apk: out/apk/classes.dex out/androidrelease/tildefriends out/androidrelease-x86_64/tildefriends $(RAW_FILES) out/apk/res.apk +out/apk/TildeFriends-debug.unsigned.apk: out/apk/classes.dex out/androiddebug/tildefriends out/androiddebug-x86_64/tildefriends out/androiddebug-x86/tildefriends out/androiddebug-armv7a/tildefriends $(RAW_FILES) out/apk/res.apk +out/apk/TildeFriends-release.unsigned.apk: out/apk/classes.dex out/androidrelease/tildefriends out/androidrelease-x86_64/tildefriends out/androidrelease-x86/tildefriends out/androidrelease-armv7a/tildefriends $(RAW_FILES) out/apk/res.apk out/%.unsigned.apk: - @mkdir -p $(dir $@) out/apk$(BUILD_TYPE)/bin/aarch64/ out/apk$(BUILD_TYPE)/bin/x86_64/ + @mkdir -p $(dir $@) out/apk$(BUILD_TYPE)/bin/aarch64/ out/apk$(BUILD_TYPE)/bin/x86_64/ out/apk$(BUILD_TYPE)/bin/i686/ out/apk$(BUILD_TYPE)/bin/armv7a/ @echo [aapt] $@ @cp out/android$(BUILD_TYPE)/tildefriends out/apk$(BUILD_TYPE)/bin/aarch64/ @cp out/android$(BUILD_TYPE)-x86_64/tildefriends out/apk$(BUILD_TYPE)/bin/x86_64/ + @cp out/android$(BUILD_TYPE)-x86/tildefriends out/apk$(BUILD_TYPE)/bin/i686/ + @cp out/android$(BUILD_TYPE)-armv7a/tildefriends out/apk$(BUILD_TYPE)/bin/armv7a/ @$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk$(BUILD_TYPE)/bin/aarch64/tildefriends + @$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk$(BUILD_TYPE)/bin/armv7a/tildefriends @$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk$(BUILD_TYPE)/bin/x86_64/tildefriends + @$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk$(BUILD_TYPE)/bin/i686/tildefriends @cp out/apk/res.apk $@ @cp out/apk/classes.dex out/apk$(BUILD_TYPE)/ @cd out/apk$(BUILD_TYPE) && zip -u ../../$@ -q -9 -r . && cd ../../