diff --git a/native/jni/magiskpolicy/rules.cpp b/native/jni/magiskpolicy/rules.cpp index 6ea22e408..ffbc83bfc 100644 --- a/native/jni/magiskpolicy/rules.cpp +++ b/native/jni/magiskpolicy/rules.cpp @@ -196,7 +196,7 @@ void sepol_magisk_rules() { // Allow update_engine/addon.d-v2 to run permissive on all ROMs sepol_permissive("update_engine"); -#ifdef MAGISK_DEBUG +#if 0 // Remove all dontaudit in debug mode strip_dontaudit(); #endif diff --git a/native/jni/utils/files.h b/native/jni/utils/files.h index dd44ea630..26880258b 100644 --- a/native/jni/utils/files.h +++ b/native/jni/utils/files.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include @@ -42,7 +43,7 @@ void parse_prop_file(const char *file, const std::function void *__mmap(const char *filename, size_t *size, bool rw); void frm_rf(int dirfd, std::initializer_list excl = std::initializer_list()); void clone_dir(int src, int dest, bool overwrite = true); -void parse_mnt(const char *file, const std::function &fn); +void parse_mnt(const char *file, const std::function &fn); template void full_read(const char *filename, T &buf, size_t &size) { diff --git a/native/jni/utils/include/stream.h b/native/jni/utils/include/stream.h index ff855c8af..a07097fce 100644 --- a/native/jni/utils/include/stream.h +++ b/native/jni/utils/include/stream.h @@ -27,8 +27,7 @@ public: // Delegates all operations to the base FILE pointer class filter_stream : public stream { public: - filter_stream() = default; - filter_stream(sFILE &&fp) : fp(std::move(fp)) {} + filter_stream(sFILE &&fp = make_sFILE()) : fp(std::move(fp)) {} int read(void *buf, size_t len) override; int write(const void *buf, size_t len) override;