From 1e2f776b83bbf3b9cef064eb608afa0dfd9ece38 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 17 Jun 2020 01:17:28 -0700
Subject: [PATCH] Move logging.hpp

---
 native/jni/core/socket.cpp                 | 1 -
 native/jni/include/magisk.hpp              | 1 -
 native/jni/init/getinfo.cpp                | 1 -
 native/jni/init/init.hpp                   | 2 +-
 native/jni/init/mount.cpp                  | 1 -
 native/jni/init/twostage.cpp               | 1 -
 native/jni/magiskboot/bootimg.cpp          | 1 -
 native/jni/magiskboot/compress.cpp         | 1 -
 native/jni/magiskboot/main.cpp             | 1 -
 native/jni/magiskhide/proc_monitor.cpp     | 1 -
 native/jni/magiskpolicy/magiskpolicy.cpp   | 1 -
 native/jni/magiskpolicy/policydb.cpp       | 1 -
 native/jni/magiskpolicy/rules.cpp          | 2 +-
 native/jni/magiskpolicy/sepolicy.cpp       | 1 -
 native/jni/magiskpolicy/statement.cpp      | 1 -
 native/jni/resetprop/_resetprop.hpp        | 1 -
 native/jni/resetprop/resetprop.cpp         | 1 -
 native/jni/su/connect.cpp                  | 1 -
 native/jni/su/pts.cpp                      | 2 +-
 native/jni/su/su_daemon.cpp                | 1 -
 native/jni/utils/cpio.cpp                  | 1 -
 native/jni/utils/include/utils.hpp         | 1 +
 native/jni/utils/logging.cpp               | 2 +-
 native/jni/utils/{include => }/logging.hpp | 0
 native/jni/utils/misc.cpp                  | 1 -
 native/jni/utils/stream.cpp                | 1 -
 native/jni/utils/xwrap.cpp                 | 1 -
 27 files changed, 5 insertions(+), 25 deletions(-)
 rename native/jni/utils/{include => }/logging.hpp (100%)

diff --git a/native/jni/core/socket.cpp b/native/jni/core/socket.cpp
index cdde5e5a4..3aa5d091d 100644
--- a/native/jni/core/socket.cpp
+++ b/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)
 
diff --git a/native/jni/include/magisk.hpp b/native/jni/include/magisk.hpp
index 72afdbd35..2203f966b 100644
--- a/native/jni/include/magisk.hpp
+++ b/native/jni/include/magisk.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <logging.hpp>
 #include <string>
 
 #define MAIN_SOCKET  "d30138f2310a9fb9c54a3e0c21f58591"
diff --git a/native/jni/init/getinfo.cpp b/native/jni/init/getinfo.cpp
index b34df144d..cb4be3278 100644
--- a/native/jni/init/getinfo.cpp
+++ b/native/jni/init/getinfo.cpp
@@ -6,7 +6,6 @@
 #include <vector>
 
 #include <utils.hpp>
-#include <logging.hpp>
 
 #include "init.hpp"
 
diff --git a/native/jni/init/init.hpp b/native/jni/init/init.hpp
index 4f445d6f4..c95a17351 100644
--- a/native/jni/init/init.hpp
+++ b/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;
diff --git a/native/jni/init/mount.cpp b/native/jni/init/mount.cpp
index ffae2ee0a..41f7952f4 100644
--- a/native/jni/init/mount.cpp
+++ b/native/jni/init/mount.cpp
@@ -5,7 +5,6 @@
 #include <vector>
 
 #include <utils.hpp>
-#include <logging.hpp>
 #include <selinux.hpp>
 #include <magisk.hpp>
 
diff --git a/native/jni/init/twostage.cpp b/native/jni/init/twostage.cpp
index d02940933..8af4eb547 100644
--- a/native/jni/init/twostage.cpp
+++ b/native/jni/init/twostage.cpp
@@ -1,6 +1,5 @@
 #include <magisk.hpp>
 #include <utils.hpp>
-#include <logging.hpp>
 #include <socket.hpp>
 
 #include "init.hpp"
diff --git a/native/jni/magiskboot/bootimg.cpp b/native/jni/magiskboot/bootimg.cpp
index 0a088e04b..0c6944542 100644
--- a/native/jni/magiskboot/bootimg.cpp
+++ b/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"
diff --git a/native/jni/magiskboot/compress.cpp b/native/jni/magiskboot/compress.cpp
index 9fded1a8d..0cee735bd 100644
--- a/native/jni/magiskboot/compress.cpp
+++ b/native/jni/magiskboot/compress.cpp
@@ -13,7 +13,6 @@
 #include <lz4frame.h>
 #include <lz4hc.h>
 
-#include <logging.hpp>
 #include <utils.hpp>
 
 #include "magiskboot.hpp"
diff --git a/native/jni/magiskboot/main.cpp b/native/jni/magiskboot/main.cpp
index dc9a0c22d..1d04fd8fd 100644
--- a/native/jni/magiskboot/main.cpp
+++ b/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"
diff --git a/native/jni/magiskhide/proc_monitor.cpp b/native/jni/magiskhide/proc_monitor.cpp
index e249c14fe..5a43977e6 100644
--- a/native/jni/magiskhide/proc_monitor.cpp
+++ b/native/jni/magiskhide/proc_monitor.cpp
@@ -13,7 +13,6 @@
 #include <vector>
 #include <bitset>
 
-#include <logging.hpp>
 #include <utils.hpp>
 
 #include "magiskhide.hpp"
diff --git a/native/jni/magiskpolicy/magiskpolicy.cpp b/native/jni/magiskpolicy/magiskpolicy.cpp
index 45d441427..9897364d5 100644
--- a/native/jni/magiskpolicy/magiskpolicy.cpp
+++ b/native/jni/magiskpolicy/magiskpolicy.cpp
@@ -1,4 +1,3 @@
-#include <logging.hpp>
 #include <utils.hpp>
 #include <magiskpolicy.hpp>
 
diff --git a/native/jni/magiskpolicy/policydb.cpp b/native/jni/magiskpolicy/policydb.cpp
index 57193fe62..1dc9a7790 100644
--- a/native/jni/magiskpolicy/policydb.cpp
+++ b/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>
 
diff --git a/native/jni/magiskpolicy/rules.cpp b/native/jni/magiskpolicy/rules.cpp
index e31f0df47..c790693ce 100644
--- a/native/jni/magiskpolicy/rules.cpp
+++ b/native/jni/magiskpolicy/rules.cpp
@@ -1,4 +1,4 @@
-#include <logging.hpp>
+#include <utils.hpp>
 #include <magiskpolicy.hpp>
 
 #include "sepolicy.hpp"
diff --git a/native/jni/magiskpolicy/sepolicy.cpp b/native/jni/magiskpolicy/sepolicy.cpp
index 352ac34fa..d9dea4dc5 100644
--- a/native/jni/magiskpolicy/sepolicy.cpp
+++ b/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"
diff --git a/native/jni/magiskpolicy/statement.cpp b/native/jni/magiskpolicy/statement.cpp
index ddc0a2f6f..1b03b02bb 100644
--- a/native/jni/magiskpolicy/statement.cpp
+++ b/native/jni/magiskpolicy/statement.cpp
@@ -3,7 +3,6 @@
 #include <string>
 
 #include <magiskpolicy.hpp>
-#include <logging.hpp>
 #include <utils.hpp>
 
 #include "sepolicy.hpp"
diff --git a/native/jni/resetprop/_resetprop.hpp b/native/jni/resetprop/_resetprop.hpp
index 6d8b3459f..03a9eb428 100644
--- a/native/jni/resetprop/_resetprop.hpp
+++ b/native/jni/resetprop/_resetprop.hpp
@@ -2,7 +2,6 @@
 
 #include <string>
 #include <map>
-#include <logging.hpp>
 
 #include <system_properties.h>
 
diff --git a/native/jni/resetprop/resetprop.cpp b/native/jni/resetprop/resetprop.cpp
index 3dad2198e..f5e194775 100644
--- a/native/jni/resetprop/resetprop.cpp
+++ b/native/jni/resetprop/resetprop.cpp
@@ -3,7 +3,6 @@
 #include <vector>
 #include <map>
 
-#include <logging.hpp>
 #include <resetprop.hpp>
 #include <utils.hpp>
 
diff --git a/native/jni/su/connect.cpp b/native/jni/su/connect.cpp
index 08126c201..9ff6fc5fa 100644
--- a/native/jni/su/connect.cpp
+++ b/native/jni/su/connect.cpp
@@ -7,7 +7,6 @@
 
 #include <daemon.hpp>
 #include <utils.hpp>
-#include <logging.hpp>
 
 #include "su.hpp"
 
diff --git a/native/jni/su/pts.cpp b/native/jni/su/pts.cpp
index a766e42ea..7000cc881 100644
--- a/native/jni/su/pts.cpp
+++ b/native/jni/su/pts.cpp
@@ -17,7 +17,7 @@
 #include <errno.h>
 #include <pthread.h>
 
-#include <logging.hpp>
+#include <utils.hpp>
 
 #include "pts.hpp"
 
diff --git a/native/jni/su/su_daemon.cpp b/native/jni/su/su_daemon.cpp
index 6361e937c..a46e5ed2f 100644
--- a/native/jni/su/su_daemon.cpp
+++ b/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>
diff --git a/native/jni/utils/cpio.cpp b/native/jni/utils/cpio.cpp
index 7a0b15ab9..187fd1826 100644
--- a/native/jni/utils/cpio.cpp
+++ b/native/jni/utils/cpio.cpp
@@ -5,7 +5,6 @@
 #include <algorithm>
 
 #include <utils.hpp>
-#include <logging.hpp>
 #include <cpio.hpp>
 
 using namespace std;
diff --git a/native/jni/utils/include/utils.hpp b/native/jni/utils/include/utils.hpp
index 1498b6514..fede4dc5b 100644
--- a/native/jni/utils/include/utils.hpp
+++ b/native/jni/utils/include/utils.hpp
@@ -4,3 +4,4 @@
 #include "../xwrap.hpp"
 #include "../files.hpp"
 #include "../misc.hpp"
+#include "../logging.hpp"
diff --git a/native/jni/utils/logging.cpp b/native/jni/utils/logging.cpp
index 34bd09c54..dedf846bd 100644
--- a/native/jni/utils/logging.cpp
+++ b/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;
diff --git a/native/jni/utils/include/logging.hpp b/native/jni/utils/logging.hpp
similarity index 100%
rename from native/jni/utils/include/logging.hpp
rename to native/jni/utils/logging.hpp
diff --git a/native/jni/utils/misc.cpp b/native/jni/utils/misc.cpp
index 7d720566f..1c1f220bb 100644
--- a/native/jni/utils/misc.cpp
+++ b/native/jni/utils/misc.cpp
@@ -15,7 +15,6 @@
 #include <random>
 #include <string>
 
-#include <logging.hpp>
 #include <utils.hpp>
 
 using namespace std;
diff --git a/native/jni/utils/stream.cpp b/native/jni/utils/stream.cpp
index 3461decd5..ef29a2946 100644
--- a/native/jni/utils/stream.cpp
+++ b/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) {
diff --git a/native/jni/utils/xwrap.cpp b/native/jni/utils/xwrap.cpp
index a78ed8e27..2c53335f9 100644
--- a/native/jni/utils/xwrap.cpp
+++ b/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;