From 3a60ef20393b705e6d0f82d5b43519812eacc4aa Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 21 Nov 2025 11:46:23 -0800 Subject: [PATCH] Update to ONDK r29.3 --- app/buildSrc/src/main/java/Setup.kt | 2 +- build.py | 2 +- native/src/boot/lib.rs | 1 - native/src/core/lib.rs | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/buildSrc/src/main/java/Setup.kt b/app/buildSrc/src/main/java/Setup.kt index d8c2d6047..4a16ecf5a 100644 --- a/app/buildSrc/src/main/java/Setup.kt +++ b/app/buildSrc/src/main/java/Setup.kt @@ -55,7 +55,7 @@ fun Project.setupCommon() { compileSdkVersion(36) buildToolsVersion = "36.0.0" ndkPath = "$sdkDirectory/ndk/magisk" - ndkVersion = "29.0.13846066" + ndkVersion = "29.0.14206865" defaultConfig { minSdk = 23 diff --git a/build.py b/build.py index d0a60cc34..cc110629b 100755 --- a/build.py +++ b/build.py @@ -80,7 +80,7 @@ support_targets = {"magisk", "magiskinit", "magiskboot", "magiskpolicy", "resetp default_targets = support_targets - {"resetprop"} rust_targets = default_targets.copy() clean_targets = {"native", "cpp", "rust", "app"} -ondk_version = "r29.2" +ondk_version = "r29.3" # Global vars config = {} diff --git a/native/src/boot/lib.rs b/native/src/boot/lib.rs index 12616b2a9..2be521538 100644 --- a/native/src/boot/lib.rs +++ b/native/src/boot/lib.rs @@ -1,5 +1,4 @@ #![feature(format_args_nl)] -#![feature(btree_extract_if)] #![feature(iter_intersperse)] #![feature(try_blocks)] diff --git a/native/src/core/lib.rs b/native/src/core/lib.rs index e031f8ff2..7a6201410 100644 --- a/native/src/core/lib.rs +++ b/native/src/core/lib.rs @@ -1,5 +1,4 @@ #![feature(try_blocks)] -#![feature(let_chains)] #![feature(fn_traits)] #![feature(unix_socket_ancillary_data)] #![feature(unix_socket_peek)]