Move logging.hpp

native/jni/core/socket.cpp

@@ -5,7 +5,6 @@
 
 #include <socket.hpp>
 #include <utils.hpp>
-#include <logging.hpp>
 
 #define ABS_SOCKET_LEN(sun) (sizeof(sa_family_t) + strlen(sun->sun_path + 1) + 1)
 

native/jni/include/magisk.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <logging.hpp>
 #include <string>
 
 #define MAIN_SOCKET  "d30138f2310a9fb9c54a3e0c21f58591"

native/jni/init/getinfo.cpp

@@ -6,7 +6,6 @@
 #include <vector>
 
 #include <utils.hpp>
-#include <logging.hpp>
 
 #include "init.hpp"
 

native/jni/init/init.hpp

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <vector>
 
-#include <logging.hpp>
+#include <utils.hpp>
 
 struct cmdline {
 	bool skip_initramfs;

native/jni/init/mount.cpp

@@ -5,7 +5,6 @@
 #include <vector>
 
 #include <utils.hpp>
-#include <logging.hpp>
 #include <selinux.hpp>
 #include <magisk.hpp>
 

native/jni/init/twostage.cpp

@@ -1,6 +1,5 @@
 #include <magisk.hpp>
 #include <utils.hpp>
-#include <logging.hpp>
 #include <socket.hpp>
 
 #include "init.hpp"

native/jni/magiskboot/bootimg.cpp

@@ -10,7 +10,6 @@
 #include <mincrypt/sha.h>
 #include <mincrypt/sha256.h>
 #include <utils.hpp>
-#include <logging.hpp>
 
 #include "bootimg.hpp"
 #include "magiskboot.hpp"

native/jni/magiskboot/compress.cpp

@@ -13,7 +13,6 @@
 #include <lz4frame.h>
 #include <lz4hc.h>
 
-#include <logging.hpp>
 #include <utils.hpp>
 
 #include "magiskboot.hpp"

native/jni/magiskboot/main.cpp

@@ -5,7 +5,6 @@
 #include <sys/mman.h>
 
 #include <mincrypt/sha.h>
-#include <logging.hpp>
 #include <utils.hpp>
 
 #include "magiskboot.hpp"

native/jni/magiskhide/proc_monitor.cpp

@@ -13,7 +13,6 @@
 #include <vector>
 #include <bitset>
 
-#include <logging.hpp>
 #include <utils.hpp>
 
 #include "magiskhide.hpp"

native/jni/magiskpolicy/magiskpolicy.cpp

@@ -1,4 +1,3 @@
-#include <logging.hpp>
 #include <utils.hpp>
 #include <magiskpolicy.hpp>
 

native/jni/magiskpolicy/policydb.cpp

@@ -6,7 +6,6 @@
 #include <cil/cil.h>
 
 #include <utils.hpp>
-#include <logging.hpp>
 #include <stream.hpp>
 #include <magiskpolicy.hpp>
 

native/jni/magiskpolicy/rules.cpp

@@ -1,4 +1,4 @@
-#include <logging.hpp>
+#include <utils.hpp>
 #include <magiskpolicy.hpp>
 
 #include "sepolicy.hpp"

native/jni/magiskpolicy/sepolicy.cpp

@@ -1,7 +1,6 @@
 #include <sepol/policydb/policydb.h>
 
 #include <magiskpolicy.hpp>
-#include <logging.hpp>
 #include <utils.hpp>
 
 #include "sepolicy.hpp"

native/jni/magiskpolicy/statement.cpp

@@ -3,7 +3,6 @@
 #include <string>
 
 #include <magiskpolicy.hpp>
-#include <logging.hpp>
 #include <utils.hpp>
 
 #include "sepolicy.hpp"

native/jni/resetprop/_resetprop.hpp

@@ -2,7 +2,6 @@
 
 #include <string>
 #include <map>
-#include <logging.hpp>
 
 #include <system_properties.h>
 

native/jni/resetprop/resetprop.cpp

@@ -3,7 +3,6 @@
 #include <vector>
 #include <map>
 
-#include <logging.hpp>
 #include <resetprop.hpp>
 #include <utils.hpp>
 

native/jni/su/connect.cpp

@@ -7,7 +7,6 @@
 
 #include <daemon.hpp>
 #include <utils.hpp>
-#include <logging.hpp>
 
 #include "su.hpp"
 

native/jni/su/pts.cpp

@@ -17,7 +17,7 @@
 #include <errno.h>
 #include <pthread.h>
 
-#include <logging.hpp>
+#include <utils.hpp>
 
 #include "pts.hpp"
 

native/jni/su/su_daemon.cpp

@@ -12,7 +12,6 @@
 #include <sys/wait.h>
 #include <sys/mount.h>
 
-#include <logging.hpp>
 #include <daemon.hpp>
 #include <utils.hpp>
 #include <selinux.hpp>

native/jni/utils/cpio.cpp

@@ -5,7 +5,6 @@
 #include <algorithm>
 
 #include <utils.hpp>
-#include <logging.hpp>
 #include <cpio.hpp>
 
 using namespace std;

native/jni/utils/include/utils.hpp

@@ -4,3 +4,4 @@
 #include "../xwrap.hpp"
 #include "../files.hpp"
 #include "../misc.hpp"
+#include "../logging.hpp"

native/jni/utils/logging.cpp

@@ -1,7 +1,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include <logging.hpp>
+#include "logging.hpp"
 #include <flags.hpp>
 
 using namespace std;

native/jni/utils/misc.cpp

@@ -15,7 +15,6 @@
 #include <random>
 #include <string>
 
-#include <logging.hpp>
 #include <utils.hpp>
 
 using namespace std;

native/jni/utils/stream.cpp

@@ -1,5 +1,4 @@
 #include <utils.hpp>
-#include <logging.hpp>
 #include <stream.hpp>
 
 static int strm_read(void *v, char *buf, int len) {

native/jni/utils/xwrap.cpp

@@ -10,7 +10,6 @@
 #include <sys/mman.h>
 #include <sys/sendfile.h>
 
-#include <logging.hpp>
 #include <utils.hpp>
 
 using namespace std;