ksud: add armeabi-v7a support

reference: rsuntk/KernelSUonArm32@a204e79

userspace/ksud: drop loopdev dependency

loopdev is KernelSU's losetup replacement.
Not required since we use magic mount.

Suggested-by: rsuntk <[email protected]>

userspace/ksud: import prebuilts for arm / armeabi-v7a

- busybox imported from https://github.com/topjohnwu/magisk-files/releases
busybox-1.36.1.0.zip

resetprop I just kanged from rsuntk

Author: rsuntk

.github/workflows/build-manager.yml

@@ -21,6 +21,8 @@ jobs:
         include:
           - target: aarch64-linux-android
             os: ubuntu-latest
+          - target: armv7-linux-androideabi
+            os: ubuntu-latest
     uses: ./.github/workflows/ksud.yml
     with:
       target: ${{ matrix.target }}
@@ -80,10 +82,18 @@ jobs:
           name: ksud-aarch64-linux-android
           path: .
 
+      - name: Download arm ksud
+        uses: actions/download-artifact@v4
+        with:
+          name: ksud-armv7-linux-androideabi
+          path: .
+
       - name: Copy ksud to app jniLibs
         run: |
           mkdir -p app/src/main/jniLibs/arm64-v8a
           cp -f ../aarch64-linux-android/release/ksud ../manager/app/src/main/jniLibs/arm64-v8a/libksud.so
+          mkdir -p app/src/main/jniLibs/armeabi-v7a
+          cp -f ../armv7-linux-androideabi/release/ksud ../manager/app/src/main/jniLibs/armeabi-v7a/libksud.so
 
       - name: Build with Gradle
         run: ./gradlew clean assembleRelease

manager/build.gradle.kts

@@ -17,7 +17,7 @@ cmaker {
                 "-DANDROID_STL=none",
             )
         )
-        abiFilters("arm64-v8a")
+        abiFilters("arm64-v8a", "armeabi-v7a")
     }
     buildTypes {
         if (it.name == "release") {
@@ -69,7 +69,7 @@ subprojects {
                     versionName = managerVersionName
                 }
                 ndk {
-                    abiFilters += listOf("arm64-v8a")
+                    abiFilters += listOf("arm64-v8a", "armeabi-v7a")
                 }
             }
 

userspace/ksud/Cargo.lock

@@ -53,7 +53,6 @@ rustix = { git = "https://github.com/Kernel-SU/rustix.git", branch = "main", fea
 # some android specific dependencies which compiles under unix are also listed here for convenience of coding
 android-properties = { version = "0.2", features = ["bionic-deprecated"] }
 procfs = "0.17"
-loopdev = { git = "https://github.com/Kernel-SU/loopdev" }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = { version = "0.15", default-features = false }

userspace/ksud/Cargo.toml

@@ -9,15 +9,14 @@ 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");
 
-#[cfg(all(target_arch = "x86_64", target_os = "android"))]
+#[cfg(all(target_arch = "aarch64", target_os = "android"))]
 #[derive(RustEmbed)]
-#[folder = "bin/x86_64"]
+#[folder = "bin/aarch64"]
 struct Asset;
 
-// IF NOT x86_64 ANDROID, ie. macos, linux, windows, always use aarch64
-#[cfg(not(all(target_arch = "x86_64", target_os = "android")))]
+#[cfg(all(target_arch = "arm", target_os = "android"))]
 #[derive(RustEmbed)]
-#[folder = "bin/aarch64"]
+#[folder = "bin/arm"]
 struct Asset;
 
 pub fn ensure_binaries(ignore_if_exist: bool) -> Result<()> {

userspace/ksud/bin/arm/busybox

@@ -202,7 +202,6 @@ pub fn root_shell() -> Result<()> {
     if free_idx < matches.free.len() {
         let name = &matches.free[free_idx];
         uid = unsafe {
-            #[cfg(target_arch = "aarch64")]
             let pw = libc::getpwnam(name.as_ptr()).as_ref();
             #[cfg(target_arch = "x86_64")]
             let pw = libc::getpwnam(name.as_ptr() as *const i8).as_ref();

userspace/ksud/bin/arm/resetprop

@@ -1,3 +1,3 @@
-APP_ABI := arm64-v8a x86_64
+APP_ABI := arm64-v8a armeabi-v7a
 APP_PLATFORM := android-24
 APP_STL := none