From 5c02a475729d4f080aea88e63c14e98a8774eaa6 Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Sat, 29 Mar 2025 16:18:56 +0800 Subject: [PATCH] Update build workflow to download arm64 kpmmgr and adjust library file paths --- .github/workflows/build-manager.yml | 10 +++++++--- userspace/kpmmgr/jni/Application.mk | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index 79aedcb3..ab1574b8 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -180,6 +180,12 @@ jobs: name: zakomksd-aarch64-linux-android path: . + - name: Download arm64 kpmmgr + uses: actions/download-artifact@v4 + with: + name: kpmmgr-aarch64-linux-android + path: . + - name: Download arm64 ksud uses: actions/download-artifact@v4 with: @@ -202,9 +208,7 @@ jobs: - name: Copy kpmmgr to app jniLibs run: | mkdir -p app/src/main/jniLibs/arm64-v8a - mkdir -p app/src/main/jniLibs/x86_64 - cp -f ../arm64-v8a/kpmmgr ../manager/app/src/main/jniLibs/arm64-v8a/kpmmgr.so - cp -f ../x86_64/kpmmgr ../manager/app/src/main/jniLibs/x86_64/kpmmgr.so + cp -f ../arm64-v8a/kpmmgr ../manager/app/src/main/jniLibs/arm64-v8a/libkpmmgr.so - name: Copy zakomksd to app jniLibs run: | diff --git a/userspace/kpmmgr/jni/Application.mk b/userspace/kpmmgr/jni/Application.mk index 873252b9..61d31236 100644 --- a/userspace/kpmmgr/jni/Application.mk +++ b/userspace/kpmmgr/jni/Application.mk @@ -1,3 +1,3 @@ -APP_ABI := arm64-v8a x86_64 +APP_ABI := arm64-v8a APP_PLATFORM := android-24 APP_STL := none