diff --git a/app/buildSrc/src/main/java/Setup.kt b/app/buildSrc/src/main/java/Setup.kt index f8029e976..1ba59d405 100644 --- a/app/buildSrc/src/main/java/Setup.kt +++ b/app/buildSrc/src/main/java/Setup.kt @@ -74,7 +74,7 @@ fun Project.setupCommon() { compileSdkVersion(36) buildToolsVersion = "36.0.0" ndkPath = "$sdkDirectory/ndk/magisk" - ndkVersion = "29.0.13113456" + ndkVersion = "28.1.13356709" defaultConfig { minSdk = 23 diff --git a/build.py b/build.py index 8364ba2f7..131c37cb6 100755 --- a/build.py +++ b/build.py @@ -71,7 +71,7 @@ default_archs = {"armeabi-v7a", "x86", "arm64-v8a", "x86_64"} default_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy"} support_targets = default_targets | {"resetprop"} rust_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy"} -ondk_version = "r29.1" +ondk_version = "r28.4" # Global vars config = {} diff --git a/native/src/core/lib.rs b/native/src/core/lib.rs index a1122b294..d9e15a0de 100644 --- a/native/src/core/lib.rs +++ b/native/src/core/lib.rs @@ -4,7 +4,6 @@ #![feature(fn_traits)] #![feature(unix_socket_ancillary_data)] #![feature(unix_socket_peek)] -#![feature(maybe_uninit_uninit_array)] #![allow(clippy::missing_safety_doc)] use crate::ffi::SuRequest; diff --git a/native/src/core/su/pts.rs b/native/src/core/su/pts.rs index 647db219c..f6dfa59bd 100644 --- a/native/src/core/su/pts.rs +++ b/native/src/core/su/pts.rs @@ -144,8 +144,7 @@ pub fn pump_tty(infd: i32, outfd: i32) { pump_via_pipe(pfd.fd, STDOUT_FILENO, &p) } else if pfd.fd == sfd { resize_pty(outfd); - let mut buf: [MaybeUninit; size_of::()] = - MaybeUninit::uninit_array(); + let mut buf = [MaybeUninit::::uninit(); size_of::()]; if unsafe { read(pfd.fd, buf.as_mut_ptr() as *mut _, buf.len()) } < 0 { error!("read error"); false