From 23ed2756147fe1009bcc702f784f7ed0baa745e6 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 18 Jun 2024 14:34:30 -0700
Subject: [PATCH] Update to ONDK r27.2

---
 buildSrc/src/main/java/Setup.kt | 2 +-
 gradle.properties               | 2 +-
 native/src/base/cstr.rs         | 5 ++---
 native/src/base/lib.rs          | 1 -
 native/src/external/busybox     | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
index a9429cf71..b1bfc2d53 100644
--- a/buildSrc/src/main/java/Setup.kt
+++ b/buildSrc/src/main/java/Setup.kt
@@ -72,7 +72,7 @@ fun Project.setupCommon() {
         compileSdkVersion(34)
         buildToolsVersion = "34.0.0"
         ndkPath = "$sdkDirectory/ndk/magisk"
-        ndkVersion = "27.0.11718014"
+        ndkVersion = "27.0.11902837"
 
         defaultConfig {
             minSdk = 23
diff --git a/gradle.properties b/gradle.properties
index bd76781ec..3aafbb4dd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,4 +28,4 @@ android.nonFinalResIds=false
 # Magisk
 magisk.stubVersion=39
 magisk.versionCode=27002
-magisk.ondkVersion=r27.1
+magisk.ondkVersion=r27.2
diff --git a/native/src/base/cstr.rs b/native/src/base/cstr.rs
index 60e1cb77f..145da1852 100644
--- a/native/src/base/cstr.rs
+++ b/native/src/base/cstr.rs
@@ -4,7 +4,7 @@ use std::fmt::{Arguments, Debug, Display, Formatter, Write};
 use std::ops::{Deref, DerefMut};
 use std::os::unix::ffi::OsStrExt;
 use std::path::{Path, PathBuf};
-use std::str::{Utf8Chunks, Utf8Error};
+use std::str::Utf8Error;
 use std::{fmt, mem, slice, str};
 
 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 {
-    let chunks = Utf8Chunks::new(s);
     let mut len = 0_usize;
-    for chunk in chunks {
+    for chunk in s.utf8_chunks() {
         len += buf.push_str(chunk.valid());
         if !chunk.invalid().is_empty() {
             len += buf.push_str(char::REPLACEMENT_CHARACTER.encode_utf8(&mut [0; 4]));
diff --git a/native/src/base/lib.rs b/native/src/base/lib.rs
index 7eb17b5b3..52c15e696 100644
--- a/native/src/base/lib.rs
+++ b/native/src/base/lib.rs
@@ -1,7 +1,6 @@
 #![allow(clippy::missing_safety_doc)]
 #![feature(format_args_nl)]
 #![feature(io_error_more)]
-#![feature(utf8_chunks)]
 
 pub use const_format;
 pub use libc;
diff --git a/native/src/external/busybox b/native/src/external/busybox
index b0f643d53..c04fc757c 160000
--- a/native/src/external/busybox
+++ b/native/src/external/busybox
@@ -1 +1 @@
-Subproject commit b0f643d5353c2c0156358d87043e25a77bae3047
+Subproject commit c04fc757cd79481dbf5bf36e7ff6f6ffdb443867