From c578cccfd57da907a82a712d321f1b12fdfde5ee Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 11 Aug 2024 04:16:19 -0700
Subject: [PATCH] Update to ONDK r27.4

---
 buildSrc/src/main/java/Setup.kt | 2 +-
 gradle.properties               | 2 +-
 native/src/Cargo.lock           | 8 ++++----
 native/src/base/cxx_extern.rs   | 3 +--
 native/src/core/lib.rs          | 1 -
 native/src/external/crt0        | 2 +-
 native/src/external/cxx-rs      | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
index a2e7bdaa0..3c107cc10 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.11902837"
+        ndkVersion = "27.0.12077973"
 
         defaultConfig {
             minSdk = 23
diff --git a/gradle.properties b/gradle.properties
index 6faf35bb7..51ac6994d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,4 +31,4 @@ android.nonFinalResIds=false
 # Magisk
 magisk.stubVersion=40
 magisk.versionCode=27006
-magisk.ondkVersion=r27.2
+magisk.ondkVersion=r27.4
diff --git a/native/src/Cargo.lock b/native/src/Cargo.lock
index 0ca42df91..4b234fd6f 100644
--- a/native/src/Cargo.lock
+++ b/native/src/Cargo.lock
@@ -182,7 +182,7 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.115"
+version = "1.0.124"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -191,7 +191,7 @@ dependencies = [
 
 [[package]]
 name = "cxx-gen"
-version = "0.7.115"
+version = "0.7.124"
 dependencies = [
  "codespan-reporting",
  "proc-macro2",
@@ -201,11 +201,11 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.115"
+version = "1.0.124"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.115"
+version = "1.0.124"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/native/src/base/cxx_extern.rs b/native/src/base/cxx_extern.rs
index 7edaf8913..2bcfa424d 100644
--- a/native/src/base/cxx_extern.rs
+++ b/native/src/base/cxx_extern.rs
@@ -4,8 +4,7 @@ use std::io;
 use std::os::fd::{BorrowedFd, OwnedFd, RawFd};
 
 use cfg_if::cfg_if;
-use cxx::private::c_char;
-use libc::mode_t;
+use libc::{c_char, mode_t};
 
 use crate::files::map_file_at;
 pub(crate) use crate::xwrap::*;
diff --git a/native/src/core/lib.rs b/native/src/core/lib.rs
index 7f980624d..d479f2f74 100644
--- a/native/src/core/lib.rs
+++ b/native/src/core/lib.rs
@@ -1,7 +1,6 @@
 #![feature(format_args_nl)]
 #![feature(try_blocks)]
 #![feature(let_chains)]
-#![feature(option_take_if)]
 #![allow(clippy::missing_safety_doc)]
 
 use base::Utf8CStr;
diff --git a/native/src/external/crt0 b/native/src/external/crt0
index 17233ab90..160291864 160000
--- a/native/src/external/crt0
+++ b/native/src/external/crt0
@@ -1 +1 @@
-Subproject commit 17233ab90ea37dd86b1867b22c3f243e8a98cd10
+Subproject commit 1602918648775f79672898abb83877dc2ca3a890
diff --git a/native/src/external/cxx-rs b/native/src/external/cxx-rs
index 16abd4d2b..7535230af 160000
--- a/native/src/external/cxx-rs
+++ b/native/src/external/cxx-rs
@@ -1 +1 @@
-Subproject commit 16abd4d2b4a1fed0198670e82ccd7569152e570f
+Subproject commit 7535230afbea588119afd35a057a1f5f609a47f9