diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index a4e3c9ab..f33a6fdc 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -8,7 +8,6 @@ on: - 'manager/**' - 'kernel/**' - 'userspace/ksud/**' - - 'userspace/susfsd/**' pull_request: branches: [ "magic" ] paths: @@ -21,20 +20,8 @@ jobs: uses: ./.github/workflows/build-lkm.yml secrets: inherit - build-susfsd: - needs: build-lkm - strategy: - matrix: - include: - - target: aarch64-linux-android - os: ubuntu-latest - uses: ./.github/workflows/susfsd.yml - with: - target: ${{ matrix.target }} - os: ${{ matrix.os }} - build-ksud: - needs: build-susfsd + needs: build-lkm strategy: matrix: include: @@ -82,23 +69,12 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v3 - - name: Download arm64 susfsd - uses: actions/download-artifact@v4 - with: - name: susfsd-aarch64-linux-android - path: . - - name: Download arm64 ksud uses: actions/download-artifact@v4 with: name: ksud-aarch64-linux-android path: . - - name: Copy susfsd to app jniLibs - run: | - mkdir -p app/src/main/jniLibs/arm64-v8a - cp -f ../arm64-v8a/susfsd ../manager/app/src/main/jniLibs/arm64-v8a/libsusfsd.so - - name: Copy ksud to app jniLibs run: | cp -f ../aarch64-linux-android/release/ksud ../manager/app/src/main/jniLibs/arm64-v8a/libksud.so diff --git a/.github/workflows/ksud.yml b/.github/workflows/ksud.yml index 77b9841d..5e74bb17 100644 --- a/.github/workflows/ksud.yml +++ b/.github/workflows/ksud.yml @@ -32,10 +32,6 @@ jobs: if: ${{ inputs.pack_lkm }} run: | cp android*-lkm/*_kernelsu.ko ./userspace/ksud/bin/aarch64/ - - - name: Add susfsd lib - run: | - cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud/bin/aarch64/ - name: Setup rustup run: | diff --git a/manager/app/src/main/jniLibs/arm64-v8a/libsusfsd.so b/manager/app/src/main/jniLibs/arm64-v8a/libsusfsd.so deleted file mode 100755 index cc59ba9d..00000000 Binary files a/manager/app/src/main/jniLibs/arm64-v8a/libsusfsd.so and /dev/null differ diff --git a/userspace/ksud/bin/aarch64/susfsd b/userspace/ksud/bin/aarch64/susfsd deleted file mode 100755 index 13c131f9..00000000 Binary files a/userspace/ksud/bin/aarch64/susfsd and /dev/null differ diff --git a/userspace/ksud/src/assets.rs b/userspace/ksud/src/assets.rs index f7623bbe..e8255c82 100644 --- a/userspace/ksud/src/assets.rs +++ b/userspace/ksud/src/assets.rs @@ -8,7 +8,6 @@ use crate::{defs::BINARY_DIR, utils}; pub const RESETPROP_PATH: &str = concatcp!(BINARY_DIR, "resetprop"); pub const BUSYBOX_PATH: &str = concatcp!(BINARY_DIR, "busybox"); pub const BOOTCTL_PATH: &str = concatcp!(BINARY_DIR, "bootctl"); -pub const SUSFSD_PATH: &str = concatcp!(BINARY_DIR, "susfsd"); #[cfg(all(target_arch = "x86_64", target_os = "android"))] #[derive(RustEmbed)]