From 5627053b7481618adfdf8fa3569b48275589915b Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 23 May 2023 01:36:25 -0700
Subject: [PATCH] Move su folder into core

---
 native/src/Android.mk                  | 8 ++++----
 native/src/{ => core}/su/connect.cpp   | 0
 native/src/{ => core}/su/pts.cpp       | 0
 native/src/{ => core}/su/pts.hpp       | 0
 native/src/{ => core}/su/su.cpp        | 0
 native/src/{ => core}/su/su.hpp        | 0
 native/src/{ => core}/su/su_daemon.cpp | 0
 native/src/init/twostage.cpp           | 1 -
 8 files changed, 4 insertions(+), 5 deletions(-)
 rename native/src/{ => core}/su/connect.cpp (100%)
 rename native/src/{ => core}/su/pts.cpp (100%)
 rename native/src/{ => core}/su/pts.hpp (100%)
 rename native/src/{ => core}/su/su.cpp (100%)
 rename native/src/{ => core}/su/su.hpp (100%)
 rename native/src/{ => core}/su/su_daemon.cpp (100%)

diff --git a/native/src/Android.mk b/native/src/Android.mk
index 5fcf00a33..e165ca99c 100644
--- a/native/src/Android.mk
+++ b/native/src/Android.mk
@@ -33,10 +33,10 @@ LOCAL_SRC_FILES := \
     core/resetprop/persist.cpp \
     core/resetprop/resetprop.cpp \
     core/core-rs.cpp \
-    su/su.cpp \
-    su/connect.cpp \
-    su/pts.cpp \
-    su/su_daemon.cpp \
+    core/su/su.cpp \
+    core/su/connect.cpp \
+    core/su/pts.cpp \
+    core/su/su_daemon.cpp \
     zygisk/entry.cpp \
     zygisk/main.cpp \
     zygisk/utils.cpp \
diff --git a/native/src/su/connect.cpp b/native/src/core/su/connect.cpp
similarity index 100%
rename from native/src/su/connect.cpp
rename to native/src/core/su/connect.cpp
diff --git a/native/src/su/pts.cpp b/native/src/core/su/pts.cpp
similarity index 100%
rename from native/src/su/pts.cpp
rename to native/src/core/su/pts.cpp
diff --git a/native/src/su/pts.hpp b/native/src/core/su/pts.hpp
similarity index 100%
rename from native/src/su/pts.hpp
rename to native/src/core/su/pts.hpp
diff --git a/native/src/su/su.cpp b/native/src/core/su/su.cpp
similarity index 100%
rename from native/src/su/su.cpp
rename to native/src/core/su/su.cpp
diff --git a/native/src/su/su.hpp b/native/src/core/su/su.hpp
similarity index 100%
rename from native/src/su/su.hpp
rename to native/src/core/su/su.hpp
diff --git a/native/src/su/su_daemon.cpp b/native/src/core/su/su_daemon.cpp
similarity index 100%
rename from native/src/su/su_daemon.cpp
rename to native/src/core/su/su_daemon.cpp
diff --git a/native/src/init/twostage.cpp b/native/src/init/twostage.cpp
index 0c105ade7..434ab2e44 100644
--- a/native/src/init/twostage.cpp
+++ b/native/src/init/twostage.cpp
@@ -2,7 +2,6 @@
 
 #include <magisk.hpp>
 #include <base.hpp>
-#include <socket.hpp>
 #include <sys/vfs.h>
 
 #include "init.hpp"