From b1007d359fffcfb8026557e3ea160694232d36cc Mon Sep 17 00:00:00 2001 From: Edoardo Lolletti Date: Thu, 8 Aug 2024 17:25:08 +0200 Subject: [PATCH] Always build all the archs for android --- jni/Application.mk | 2 +- scripts/predeploy.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jni/Application.mk b/jni/Application.mk index ae0fe2e6..f2c34a8b 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := armeabi-v7a arm64-v8a x86 +APP_ABI := all APP_PLATFORM := android-16 APP_STL := c++_static APP_CPPFLAGS := -std=c++1z diff --git a/scripts/predeploy.sh b/scripts/predeploy.sh index 925c0293..bf5a9e72 100755 --- a/scripts/predeploy.sh +++ b/scripts/predeploy.sh @@ -11,9 +11,9 @@ if [[ "$TARGET_OS" == "windows" ]]; then strip $DEPLOY_DIR/ocgcore.dll fi elif [[ "$TARGET_OS" == "android" ]]; then - ARCH=("armeabi-v7a" "arm64-v8a" "x86" "x86_64" ) - OUTPUT=("libocgcorev7.so" "libocgcorev8.so" "libocgcorex86.so" "libocgcorex64.so") - for i in {0..3}; do + ARCH=("armeabi-v7a" "arm64-v8a" "x86" "x86_64" "armeabi" "mips" "mips64") + OUTPUT=("libocgcorev7.so" "libocgcorev8.so" "libocgcorex86.so" "libocgcorex64.so" "libocgcoreeabi.so" "libocgcoremips.so" "libocgcoremips64.so") + for i in {0..6}; do CORE="libs/${ARCH[i]}/libocgcore.so" if [[ -f "$CORE" ]]; then mv $CORE "$DEPLOY_DIR/${OUTPUT[i]}"