diff --git a/gradle.properties b/gradle.properties index ddc3ea693..72270a26a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,4 +28,4 @@ android.nonFinalResIds=false # Magisk magisk.stubVersion=37 magisk.versionCode=26105 -magisk.ondkVersion=r25.6 +magisk.ondkVersion=r25.7 diff --git a/native/src/boot/bootimg.cpp b/native/src/boot/bootimg.cpp index a80a746f0..68519d2d7 100644 --- a/native/src/boot/bootimg.cpp +++ b/native/src/boot/bootimg.cpp @@ -116,7 +116,7 @@ void dyn_img_hdr::dump_hdr_file() const { } void dyn_img_hdr::load_hdr_file() { - parse_prop_file(HEADER_FILE, [=](string_view key, string_view value) -> bool { + parse_prop_file(HEADER_FILE, [=, this](string_view key, string_view value) -> bool { if (key == "name" && name()) { memset(name(), 0, 16); memcpy(name(), value.data(), value.length() > 15 ? 15 : value.length()); diff --git a/native/src/boot/lib.rs b/native/src/boot/lib.rs index ead6d0894..8dc7e1a33 100644 --- a/native/src/boot/lib.rs +++ b/native/src/boot/lib.rs @@ -1,5 +1,5 @@ #![feature(format_args_nl)] -#![feature(btree_drain_filter)] +#![feature(btree_extract_if)] pub use base; use cpio::cpio_commands; diff --git a/native/src/boot/ramdisk.rs b/native/src/boot/ramdisk.rs index cb2110417..db47417d9 100644 --- a/native/src/boot/ramdisk.rs +++ b/native/src/boot/ramdisk.rs @@ -93,7 +93,7 @@ impl MagiskCpio for Cpio { let mut backups = HashMap::>::new(); let mut rm_list = String::new(); self.entries - .drain_filter(|name, _| name.starts_with(".backup/")) + .extract_if(|name, _| name.starts_with(".backup/")) .for_each(|(name, entry)| { if name == ".backup/.rmlist" { if let Ok(data) = from_utf8(&entry.data) { diff --git a/native/src/sepolicy/sepolicy.cpp b/native/src/sepolicy/sepolicy.cpp index 9b92cfda5..f1fff5afd 100644 --- a/native/src/sepolicy/sepolicy.cpp +++ b/native/src/sepolicy/sepolicy.cpp @@ -694,7 +694,7 @@ bool sepol_impl::add_typeattribute(const char *type, const char *attr) { } void sepol_impl::strip_dontaudit() { - avtab_for_each(&db->te_avtab, [=](avtab_ptr_t node) { + avtab_for_each(&db->te_avtab, [=, this](avtab_ptr_t node) { if (node->key.specified == AVTAB_AUDITDENY || node->key.specified == AVTAB_XPERMS_DONTAUDIT) avtab_remove_node(&db->te_avtab, node); });