TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 07:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to ONDK r27.2

Browse Source
This commit is contained in:
topjohnwu 2024-06-18 14:34:30 -07:00
parent cfd1e0cf22
commit 23ed275614
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ fun Project.setupCommon() {
compileSdkVersion(34) compileSdkVersion(34)
buildToolsVersion = "34.0.0" buildToolsVersion = "34.0.0"
ndkPath = "$sdkDirectory/ndk/magisk" ndkPath = "$sdkDirectory/ndk/magisk"
ndkVersion = "27.0.11718014" ndkVersion = "27.0.11902837"
defaultConfig { defaultConfig {
minSdk = 23 minSdk = 23

2
gradle.properties
View File

@ -28,4 +28,4 @@ android.nonFinalResIds=false
# Magisk # Magisk
magisk.stubVersion=39 magisk.stubVersion=39
magisk.versionCode=27002 magisk.versionCode=27002
magisk.ondkVersion=r27.1 magisk.ondkVersion=r27.2

5
native/src/base/cstr.rs
View File

@ -4,7 +4,7 @@ use std::fmt::{Arguments, Debug, Display, Formatter, Write};
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::str::{Utf8Chunks, Utf8Error}; use std::str::Utf8Error;
use std::{fmt, mem, slice, str}; use std::{fmt, mem, slice, str};
use cxx::{type_id, ExternType}; use cxx::{type_id, ExternType};
@ -52,9 +52,8 @@ fn utf8_cstr_buf_append(buf: &mut dyn Utf8CStrBuf, s: &[u8]) -> usize {
} }
fn utf8_cstr_append_lossy(buf: &mut dyn Utf8CStrWrite, s: &[u8]) -> usize { fn utf8_cstr_append_lossy(buf: &mut dyn Utf8CStrWrite, s: &[u8]) -> usize {
let chunks = Utf8Chunks::new(s);
let mut len = 0_usize; let mut len = 0_usize;
for chunk in chunks { for chunk in s.utf8_chunks() {
len += buf.push_str(chunk.valid()); len += buf.push_str(chunk.valid());
if !chunk.invalid().is_empty() { if !chunk.invalid().is_empty() {
len += buf.push_str(char::REPLACEMENT_CHARACTER.encode_utf8(&mut [0; 4])); len += buf.push_str(char::REPLACEMENT_CHARACTER.encode_utf8(&mut [0; 4]));

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

@ -1,7 +1,6 @@
#![allow(clippy::missing_safety_doc)] #![allow(clippy::missing_safety_doc)]
#![feature(format_args_nl)] #![feature(format_args_nl)]
#![feature(io_error_more)] #![feature(io_error_more)]
#![feature(utf8_chunks)]
pub use const_format; pub use const_format;
pub use libc; pub use libc;

2
native/src/external/busybox vendored

@ -1 +1 @@
Subproject commit b0f643d5353c2c0156358d87043e25a77bae3047 Subproject commit c04fc757cd79481dbf5bf36e7ff6f6ffdb443867