TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-07-29 21:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ONDK r28.4

Browse Source
This commit is contained in:
topjohnwu 2025-05-30 00:24:24 -07:00 committed by John Wu
parent fada8b148a
commit 8c79d66b7b
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/buildSrc/src/main/java/Setup.kt
View File

@ -74,7 +74,7 @@ fun Project.setupCommon() {
compileSdkVersion(36) compileSdkVersion(36)
buildToolsVersion = "36.0.0" buildToolsVersion = "36.0.0"
ndkPath = "$sdkDirectory/ndk/magisk" ndkPath = "$sdkDirectory/ndk/magisk"
ndkVersion = "29.0.13113456" ndkVersion = "28.1.13356709"
defaultConfig { defaultConfig {
minSdk = 23 minSdk = 23

2
build.py
View File

@ -71,7 +71,7 @@ default_archs = {"armeabi-v7a", "x86", "arm64-v8a", "x86_64"}
default_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy"} default_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy"}
support_targets = default_targets | {"resetprop"} support_targets = default_targets | {"resetprop"}
rust_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy"} rust_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy"}
ondk_version = "r29.1" ondk_version = "r28.4"
# Global vars # Global vars
config = {} config = {}

1
native/src/core/lib.rs
View File

@ -4,7 +4,6 @@
#![feature(fn_traits)] #![feature(fn_traits)]
#![feature(unix_socket_ancillary_data)] #![feature(unix_socket_ancillary_data)]
#![feature(unix_socket_peek)] #![feature(unix_socket_peek)]
#![feature(maybe_uninit_uninit_array)]
#![allow(clippy::missing_safety_doc)] #![allow(clippy::missing_safety_doc)]
use crate::ffi::SuRequest; use crate::ffi::SuRequest;

3
native/src/core/su/pts.rs
View File

@ -144,8 +144,7 @@ pub fn pump_tty(infd: i32, outfd: i32) {
pump_via_pipe(pfd.fd, STDOUT_FILENO, &p) pump_via_pipe(pfd.fd, STDOUT_FILENO, &p)
} else if pfd.fd == sfd { } else if pfd.fd == sfd {
resize_pty(outfd); resize_pty(outfd);
let mut buf: [MaybeUninit<u8>; size_of::<signalfd_siginfo>()] = let mut buf = [MaybeUninit::<u8>::uninit(); size_of::<signalfd_siginfo>()];
MaybeUninit::uninit_array();
if unsafe { read(pfd.fd, buf.as_mut_ptr() as *mut _, buf.len()) } < 0 { if unsafe { read(pfd.fd, buf.as_mut_ptr() as *mut _, buf.len()) } < 0 {
error!("read error"); error!("read error");
false false