Move resetprop under core

native/src/Android.mk

@@ -30,8 +30,8 @@ LOCAL_SRC_FILES := \
     core/restorecon.cpp \
     core/module.cpp \
     core/thread.cpp \
-    resetprop/persist.cpp \
-    resetprop/resetprop.cpp \
+    core/resetprop/persist.cpp \
+    core/resetprop/resetprop.cpp \
     su/su.cpp \
     su/connect.cpp \
     su/pts.cpp \
@@ -149,8 +149,8 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_SRC_FILES := \
     core/applet_stub.cpp \
-    resetprop/resetprop.cpp \
-    resetprop/persist.cpp \
+    core/resetprop/resetprop.cpp \
+    core/resetprop/persist.cpp
 
 LOCAL_CFLAGS := -DAPPLET_STUB_MAIN=resetprop_main
 include $(BUILD_EXECUTABLE)

native/src/core/bootstages.cpp

@@ -10,7 +10,6 @@
 #include <db.hpp>
 #include <base.hpp>
 #include <daemon.hpp>
-#include <resetprop.hpp>
 #include <selinux.hpp>
 
 #include "core.hpp"

native/src/core/core.hpp

@@ -26,3 +26,9 @@ void install_apk(const char *apk);
 void uninstall_pkg(const char *pkg);
 void clear_pkg(const char *pkg, int user_id);
 [[noreturn]] void install_module(const char *file);
+
+// System properties
+std::string get_prop(const char *name, bool persist = false);
+int delete_prop(const char *name, bool persist = false);
+int set_prop(const char *name, const char *value, bool skip_svc = false);
+void load_prop_file(const char *filename, bool skip_svc = false);

native/src/core/daemon.cpp

@@ -8,7 +8,6 @@
 #include <daemon.hpp>
 #include <selinux.hpp>
 #include <db.hpp>
-#include <resetprop.hpp>
 #include <flags.h>
 
 #include <core-rs.cpp>

native/src/core/module.cpp

@@ -6,7 +6,6 @@
 #include <magisk.hpp>
 #include <daemon.hpp>
 #include <selinux.hpp>
-#include <resetprop.hpp>
 
 #include "core.hpp"
 #include "node.hpp"

native/src/core/resetprop/persist.cpp

@@ -4,7 +4,7 @@
 
 #include <base.hpp>
 
-#include "prop.hpp"
+#include "resetprop.hpp"
 
 using namespace std;
 

native/src/core/resetprop/resetprop.cpp

@@ -3,10 +3,10 @@
 #include <vector>
 #include <map>
 
-#include <resetprop.hpp>
 #include <base.hpp>
 
-#include "prop.hpp"
+#include "../core.hpp"
+#include "resetprop.hpp"
 
 using namespace std;
 
@@ -333,9 +333,9 @@ int resetprop_main(int argc, char *argv[]) {
     }
 }
 
-/*******************
- * High-level APIs
- ********************/
+/***************
+ * Public APIs
+ ****************/
 
 string get_prop(const char *name, bool persist) {
     InitOnce();

native/src/include/resetprop.hpp

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <string>
-#include <functional>
-
-std::string get_prop(const char *name, bool persist = false);
-int delete_prop(const char *name, bool persist = false);
-int set_prop(const char *name, const char *value, bool skip_svc = false);
-void load_prop_file(const char *filename, bool skip_svc = false);