Update to ONDK r27.4

This commit is contained in:
topjohnwu 2024-08-11 04:16:19 -07:00
parent 07835a3e0e
commit c578cccfd5
7 changed files with 9 additions and 11 deletions

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.11902837" ndkVersion = "27.0.12077973"
defaultConfig { defaultConfig {
minSdk = 23 minSdk = 23

View File

@ -31,4 +31,4 @@ android.nonFinalResIds=false
# Magisk # Magisk
magisk.stubVersion=40 magisk.stubVersion=40
magisk.versionCode=27006 magisk.versionCode=27006
magisk.ondkVersion=r27.2 magisk.ondkVersion=r27.4

8
native/src/Cargo.lock generated
View File

@ -182,7 +182,7 @@ dependencies = [
[[package]] [[package]]
name = "cxx" name = "cxx"
version = "1.0.115" version = "1.0.124"
dependencies = [ dependencies = [
"cc", "cc",
"cxxbridge-flags", "cxxbridge-flags",
@ -191,7 +191,7 @@ dependencies = [
[[package]] [[package]]
name = "cxx-gen" name = "cxx-gen"
version = "0.7.115" version = "0.7.124"
dependencies = [ dependencies = [
"codespan-reporting", "codespan-reporting",
"proc-macro2", "proc-macro2",
@ -201,11 +201,11 @@ dependencies = [
[[package]] [[package]]
name = "cxxbridge-flags" name = "cxxbridge-flags"
version = "1.0.115" version = "1.0.124"
[[package]] [[package]]
name = "cxxbridge-macro" name = "cxxbridge-macro"
version = "1.0.115" version = "1.0.124"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

View File

@ -4,8 +4,7 @@ use std::io;
use std::os::fd::{BorrowedFd, OwnedFd, RawFd}; use std::os::fd::{BorrowedFd, OwnedFd, RawFd};
use cfg_if::cfg_if; use cfg_if::cfg_if;
use cxx::private::c_char; use libc::{c_char, mode_t};
use libc::mode_t;
use crate::files::map_file_at; use crate::files::map_file_at;
pub(crate) use crate::xwrap::*; pub(crate) use crate::xwrap::*;

View File

@ -1,7 +1,6 @@
#![feature(format_args_nl)] #![feature(format_args_nl)]
#![feature(try_blocks)] #![feature(try_blocks)]
#![feature(let_chains)] #![feature(let_chains)]
#![feature(option_take_if)]
#![allow(clippy::missing_safety_doc)] #![allow(clippy::missing_safety_doc)]
use base::Utf8CStr; use base::Utf8CStr;

@ -1 +1 @@
Subproject commit 17233ab90ea37dd86b1867b22c3f243e8a98cd10 Subproject commit 1602918648775f79672898abb83877dc2ca3a890

@ -1 +1 @@
Subproject commit 16abd4d2b4a1fed0198670e82ccd7569152e570f Subproject commit 7535230afbea588119afd35a057a1f5f609a47f9