From c9c7a5f4e3c43504e1318e5baf49db26928f866c Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Mon, 6 Oct 2025 21:08:23 +0800 Subject: [PATCH] manager: Update Repository Naming --- .github/workflows/build-manager.yml | 8 ++++---- .github/workflows/ksud.yml | 2 +- manager/app/src/main/cpp/CMakeLists.txt | 6 +++--- .../app/src/main/java/com/sukisu/ultra/Natives.kt | 2 +- .../main/java/com/sukisu/ultra/ui/util/KsuCli.kt | 12 ++++++------ manager/app/src/main/jniLibs/.gitignore | 6 ++---- .../arm64-v8a/{libzakoboot.so => libmagiskboot.so} | Bin .../{libzakoboot.so => libmagiskboot.so} | Bin .../x86_64/{libzakoboot.so => libmagiskboot.so} | Bin userspace/ksud/Cargo.toml | 2 +- userspace/susfs/jni/Android.mk | 2 +- 11 files changed, 19 insertions(+), 21 deletions(-) rename manager/app/src/main/jniLibs/arm64-v8a/{libzakoboot.so => libmagiskboot.so} (100%) rename manager/app/src/main/jniLibs/armeabi-v7a/{libzakoboot.so => libmagiskboot.so} (100%) rename manager/app/src/main/jniLibs/x86_64/{libzakoboot.so => libmagiskboot.so} (100%) diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index 4f45a0df..70205c09 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -211,14 +211,14 @@ jobs: mkdir -p app/src/main/jniLibs/arm64-v8a mkdir -p app/src/main/jniLibs/x86_64 mkdir -p app/src/main/jniLibs/armeabi-v7a - cp -f ../aarch64-linux-android/release/zakozako ../manager/app/src/main/jniLibs/arm64-v8a/libzakozako.so - cp -f ../x86_64-linux-android/release/zakozako ../manager/app/src/main/jniLibs/x86_64/libzakozako.so - cp -f ../armv7-linux-androideabi/release/zakozako ../manager/app/src/main/jniLibs/armeabi-v7a/libzakozako.so + cp -f ../aarch64-linux-android/release/ksud ../manager/app/src/main/jniLibs/arm64-v8a/libksud.so + cp -f ../x86_64-linux-android/release/ksud ../manager/app/src/main/jniLibs/x86_64/libksud.so + cp -f ../armv7-linux-androideabi/release/ksud ../manager/app/src/main/jniLibs/armeabi-v7a/libksud.so - name: Copy susfs to app jniLibs run: | mkdir -p app/src/main/jniLibs/arm64-v8a - cp -f ../arm64-v8a/zakozakozako ../manager/app/src/main/jniLibs/arm64-v8a/libzakozakozako.so + cp -f ../arm64-v8a/susfsd ../manager/app/src/main/jniLibs/arm64-v8a/libsusfsd.so - name: Copy user_scanner to app jniLibs run: | diff --git a/.github/workflows/ksud.yml b/.github/workflows/ksud.yml index 5fedf28d..7d1ea16c 100644 --- a/.github/workflows/ksud.yml +++ b/.github/workflows/ksud.yml @@ -71,4 +71,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ksud-${{ inputs.target }} - path: userspace/ksud/target/**/release/zakozako* + path: userspace/ksud/target/**/release/ksud* diff --git a/manager/app/src/main/cpp/CMakeLists.txt b/manager/app/src/main/cpp/CMakeLists.txt index abeb419b..2babafed 100644 --- a/manager/app/src/main/cpp/CMakeLists.txt +++ b/manager/app/src/main/cpp/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.18.1) project("kernelsu") -add_library(zako +add_library(kernelsu SHARED jni.c ksu.c @@ -21,7 +21,7 @@ elseif(ANDROID_ABI STREQUAL "armeabi-v7a") endif() if(ANDROID_ABI STREQUAL "arm64-v8a" OR ANDROID_ABI STREQUAL "armeabi-v7a") - target_link_libraries(zako ${log-lib} ${zakosign-lib}) + target_link_libraries(kernelsu ${log-lib} ${zakosign-lib}) else() - target_link_libraries(zako ${log-lib}) + target_link_libraries(kernelsu ${log-lib}) endif() diff --git a/manager/app/src/main/java/com/sukisu/ultra/Natives.kt b/manager/app/src/main/java/com/sukisu/ultra/Natives.kt index 15721904..198a950b 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/Natives.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/Natives.kt @@ -63,7 +63,7 @@ object Natives { init { System.loadLibrary("zakosign") - System.loadLibrary("zako") + System.loadLibrary("kernelsu") } // become root manager, return true if success. diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/util/KsuCli.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/util/KsuCli.kt index 2e05656d..4252c779 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/util/KsuCli.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/util/KsuCli.kt @@ -30,7 +30,7 @@ import java.io.File private const val TAG = "KsuCli" private fun getKsuDaemonPath(): String { - return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libzakozako.so" + return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libksud.so" } object KsuCli { @@ -99,7 +99,7 @@ fun execKsud(args: String, newShell: Boolean = false): Boolean { fun install() { val start = SystemClock.elapsedRealtime() - val magiskboot = File(ksuApp.applicationInfo.nativeLibraryDir, "libzakoboot.so").absolutePath + val magiskboot = File(ksuApp.applicationInfo.nativeLibraryDir, "libmagiskboot.so").absolutePath val result = execKsud("install --magiskboot $magiskboot", true) Log.w(TAG, "install result: $result, cost: ${SystemClock.elapsedRealtime() - start}ms") } @@ -222,7 +222,7 @@ fun runModuleAction( fun restoreBoot( onFinish: (Boolean, Int) -> Unit, onStdout: (String) -> Unit, onStderr: (String) -> Unit ): Boolean { - val magiskboot = File(ksuApp.applicationInfo.nativeLibraryDir, "libzakoboot.so") + val magiskboot = File(ksuApp.applicationInfo.nativeLibraryDir, "libmagiskboot.so") val result = flashWithIO( "${getKsuDaemonPath()} boot-restore -f --magiskboot $magiskboot", onStdout, @@ -235,7 +235,7 @@ fun restoreBoot( fun uninstallPermanently( onFinish: (Boolean, Int) -> Unit, onStdout: (String) -> Unit, onStderr: (String) -> Unit ): Boolean { - val magiskboot = File(ksuApp.applicationInfo.nativeLibraryDir, "libzakoboot.so") + val magiskboot = File(ksuApp.applicationInfo.nativeLibraryDir, "libmagiskboot.so") val result = flashWithIO("${getKsuDaemonPath()} uninstall --magiskboot $magiskboot", onStdout, onStderr) onFinish(result.isSuccess, result.code) @@ -270,7 +270,7 @@ fun installBoot( } } - val magiskboot = File(ksuApp.applicationInfo.nativeLibraryDir, "libzakoboot.so") + val magiskboot = File(ksuApp.applicationInfo.nativeLibraryDir, "libmagiskboot.so") var cmd = "boot-patch --magiskboot ${magiskboot.absolutePath}" cmd += if (bootFile == null) { @@ -505,7 +505,7 @@ fun restartApp(packageName: String) { } fun getSuSFSDaemonPath(): String { - return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libzakozakozako.so" + return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libsusfsd.so" } fun getSuSFS(): String { diff --git a/manager/app/src/main/jniLibs/.gitignore b/manager/app/src/main/jniLibs/.gitignore index 05ffdc05..41fe0b59 100644 --- a/manager/app/src/main/jniLibs/.gitignore +++ b/manager/app/src/main/jniLibs/.gitignore @@ -1,5 +1,3 @@ -libzakozako.so -libzakozakozako.so -libkpmmgr.so -libzako.so +libksud.so +libkernelsu.so libandroidx.graphics.path.so \ No newline at end of file diff --git a/manager/app/src/main/jniLibs/arm64-v8a/libzakoboot.so b/manager/app/src/main/jniLibs/arm64-v8a/libmagiskboot.so similarity index 100% rename from manager/app/src/main/jniLibs/arm64-v8a/libzakoboot.so rename to manager/app/src/main/jniLibs/arm64-v8a/libmagiskboot.so diff --git a/manager/app/src/main/jniLibs/armeabi-v7a/libzakoboot.so b/manager/app/src/main/jniLibs/armeabi-v7a/libmagiskboot.so similarity index 100% rename from manager/app/src/main/jniLibs/armeabi-v7a/libzakoboot.so rename to manager/app/src/main/jniLibs/armeabi-v7a/libmagiskboot.so diff --git a/manager/app/src/main/jniLibs/x86_64/libzakoboot.so b/manager/app/src/main/jniLibs/x86_64/libmagiskboot.so similarity index 100% rename from manager/app/src/main/jniLibs/x86_64/libzakoboot.so rename to manager/app/src/main/jniLibs/x86_64/libmagiskboot.so diff --git a/userspace/ksud/Cargo.toml b/userspace/ksud/Cargo.toml index e9abb9c5..a7acbc7f 100644 --- a/userspace/ksud/Cargo.toml +++ b/userspace/ksud/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "zakozako" +name = "ksud" version = "0.1.0" edition = "2024" diff --git a/userspace/susfs/jni/Android.mk b/userspace/susfs/jni/Android.mk index 1eeffee9..fcfe56f9 100644 --- a/userspace/susfs/jni/Android.mk +++ b/userspace/susfs/jni/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := zakozakozako +LOCAL_MODULE := susfsd LOCAL_SRC_FILES := susfs.c include $(BUILD_EXECUTABLE)