From c5a80b68ca85b3a4941562adffd8e666987124d1 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 24 Jul 2024 14:03:21 -0400 Subject: [PATCH] Fixed more aab build issues. --- GNUmakefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 861f9b57..f020b1f8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -765,8 +765,15 @@ out/TildeFriends.aab: out/apk/classes.dex $(filter-out %debug%, $(ANDROID_TARGET @mv out/aab/staging/AndroidManifest.xml out/aab/staging/manifest/AndroidManifest.xml @cp out/apk/classes.dex out/aab/staging/dex/ @rm -fv out/base.zip - @cp -r out/apk-arm-release/lib/ out/aab/staging/ - @cp -r out/apk-x86-release/lib/ out/aab/staging/ + @mkdir -p out/aab/staging/lib/arm64-v8a out/aab/staging/lib/armeabi-v7a out/aab/staging/lib/x86_64 out/aab/staging/lib/x86 + @cp out/androidrelease/tildefriends out/aab/staging/lib/arm64-v8a/libtildefriends.so + @cp out/androidrelease-armv7a/tildefriends out/aab/staging/lib/armeabi-v7a/libtildefriends.so + @cp out/androidrelease-x86_64/tildefriends out/aab/staging/lib/x86_64/libtildefriends.so + @cp out/androidrelease-x86/tildefriends out/aab/staging/lib/x86/libtildefriends.so + @$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/arm64-v8a/libtildefriends.so + @$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/armeabi-v7a/libtildefriends.so + @$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/x86_64/libtildefriends.so + @$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/x86/libtildefriends.so @cp -r apps/ out/aab/staging/root/ @rm -rf out/aab/staging/root/apps/welcome* @cp -r core/ out/aab/staging/root/