MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compile errors

Browse Source
This commit is contained in:
topjohnwu 2019-11-23 17:18:55 -05:00
parent 01253f050a
commit 34bb18448c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/magiskpolicy/rules.cpp
View File

@ -196,7 +196,7 @@ void sepol_magisk_rules() {
// Allow update_engine/addon.d-v2 to run permissive on all ROMs // Allow update_engine/addon.d-v2 to run permissive on all ROMs
sepol_permissive("update_engine"); sepol_permissive("update_engine");
#ifdef MAGISK_DEBUG #if 0
// Remove all dontaudit in debug mode // Remove all dontaudit in debug mode
strip_dontaudit(); strip_dontaudit();
#endif #endif

3
native/jni/utils/files.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <mntent.h>
#include <functional> #include <functional>
#include <string_view> #include <string_view>
@ -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 *__mmap(const char *filename, size_t *size, bool rw);
void frm_rf(int dirfd, std::initializer_list<const char *> excl = std::initializer_list<const char *>()); void frm_rf(int dirfd, std::initializer_list<const char *> excl = std::initializer_list<const char *>());
void clone_dir(int src, int dest, bool overwrite = true); void clone_dir(int src, int dest, bool overwrite = true);
void parse_mnt(const char *file, const std::function<bool (mntent*)> &fn); void parse_mnt(const char *file, const std::function<bool(mntent*)> &fn);
template <typename T> template <typename T>
void full_read(const char *filename, T &buf, size_t &size) { void full_read(const char *filename, T &buf, size_t &size) {

3
native/jni/utils/include/stream.h
View File

@ -27,8 +27,7 @@ public:
// Delegates all operations to the base FILE pointer // Delegates all operations to the base FILE pointer
class filter_stream : public stream { class filter_stream : public stream {
public: public:
filter_stream() = default; filter_stream(sFILE &&fp = make_sFILE()) : fp(std::move(fp)) {}
filter_stream(sFILE &&fp) : fp(std::move(fp)) {}
int read(void *buf, size_t len) override; int read(void *buf, size_t len) override;
int write(const void *buf, size_t len) override; int write(const void *buf, size_t len) override;