Clean/refactor includes

native/jni/core/applets.cpp

@@ -4,8 +4,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "magisk.h"
-#include "selinux.h"
+#include <magisk.h>
+#include <selinux.h>
 
 static int (*applet_main[]) (int, char *[]) =
 		{ magisk_main, su_client_main, resetprop_main, magiskhide_main, imgtool_main, nullptr };

native/jni/core/daemon.cpp

@@ -14,13 +14,13 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 
-#include "magisk.h"
-#include "utils.h"
-#include "daemon.h"
-#include "selinux.h"
-#include "db.h"
-#include "resetprop.h"
-#include "flags.h"
+#include <magisk.h>
+#include <utils.h>
+#include <daemon.h>
+#include <selinux.h>
+#include <db.h>
+#include <resetprop.h>
+#include <flags.h>
 
 int SDK_INT = -1;
 struct stat SERVER_STAT;

native/jni/core/db.cpp

@@ -5,9 +5,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "magisk.h"
-#include "db.h"
-#include "daemon.h"
+#include <magisk.h>
+#include <db.h>
+#include <daemon.h>
 
 #define DB_VERSION 7
 

native/jni/core/img.cpp

@@ -14,10 +14,10 @@
 #include <sys/sysmacros.h>
 #include <linux/loop.h>
 
-#include "magisk.h"
-#include "utils.h"
-#include "img.h"
-#include "flags.h"
+#include <magisk.h>
+#include <utils.h>
+#include <img.h>
+#include <flags.h>
 
 #define round_size(a) ((((a) / 32) + 2) * 32)
 #define SOURCE_TMP "/dev/.img_src"

native/jni/core/init.cpp

@@ -37,16 +37,15 @@
 #include <string_view>
 
 #include <xz.h>
+#include <magisk.h>
+#include <magiskpolicy.h>
+#include <selinux.h>
+#include <utils.h>
+#include <flags.h>
 
 #include "binaries.h"
 #include "binaries_arch.h"
-
 #include "magiskrc.h"
-#include "magisk.h"
-#include "magiskpolicy.h"
-#include "selinux.h"
-#include "utils.h"
-#include "flags.h"
 
 #define DEFAULT_DT_DIR "/proc/device-tree/firmware/android"
 

native/jni/core/magiskrc.h

@@ -0,0 +1,45 @@
+#include <magisk.h>
+#include <magiskpolicy.h>
+
+static const char magiskrc[] =
+
+"on early-init\n"
+"    write " EARLYINIT " 1\n"
+"    wait " EARLYINITDONE "\n"
+"    rm " EARLYINITDONE "\n"
+"\n"
+
+"on post-fs-data\n"
+"    start logd\n"
+"    load_persist_props\n"
+"    rm " UNBLOCKFILE "\n"
+"    start %s\n"
+"    wait " UNBLOCKFILE " 10\n"
+"    rm " UNBLOCKFILE "\n"
+"\n"
+
+"service %s /sbin/magisk --post-fs-data\n"
+"    user root\n"
+"    seclabel u:r:" SEPOL_PROC_DOMAIN ":s0\n"
+"    oneshot\n"
+"\n"
+
+"service %s /sbin/magisk --service\n"
+"    class late_start\n"
+"    user root\n"
+"    seclabel u:r:" SEPOL_PROC_DOMAIN ":s0\n"
+"    oneshot\n"
+"\n"
+
+#if 0
+"on property:sys.boot_completed=1\n"
+"    start magisk_bc\n"
+"\n"
+
+"service magisk_bc /sbin/magisk --boot-complete\n"
+"    user root\n"
+"    seclabel u:r:"SEPOL_PROC_DOMAIN":s0\n"
+"    oneshot\n"
+;
+#endif
+;

native/jni/core/socket.cpp

@@ -6,10 +6,10 @@
 #include <fcntl.h>
 #include <endian.h>
 
-#include "daemon.h"
-#include "logging.h"
-#include "utils.h"
-#include "magisk.h"
+#include <daemon.h>
+#include <logging.h>
+#include <utils.h>
+#include <magisk.h>
 
 #define ABS_SOCKET_LEN(sun) (sizeof(sa_family_t) + strlen(sun->sun_path + 1) + 1)