From 1d0c36a0abe8ca5a35276cf6434439985fd69a16 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 5 Nov 2016 02:35:23 +0800
Subject: [PATCH] Add resetprop to Magisk

---
 .gitmodules        | 3 +++
 jni/Android.mk     | 8 +++++++-
 jni/Application.mk | 2 ++
 jni/resetprop      | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 160000 jni/resetprop

diff --git a/.gitmodules b/.gitmodules
index 2ed75deed..5bea0fbd6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "jni/sepolicy-inject"]
 	path = jni/sepolicy-inject
 	url = https://github.com/topjohnwu/sepolicy-inject
+[submodule "jni/resetprop"]
+	path = jni/resetprop
+	url = https://github.com:topjohnwu/resetprop.git
diff --git a/jni/Android.mk b/jni/Android.mk
index 6721f51f3..c3711d678 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -19,11 +19,17 @@ include $(BUILD_EXECUTABLE)
 include $(CLEAR_VARS)
 LOCAL_MODULE := sepolicy-inject
 LOCAL_MODULE_TAGS := optional
-LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_STATIC_LIBRARIES := libsepol
 LOCAL_SRC_FILES := sepolicy-inject/sepolicy-inject.c sepolicy-inject/builtin_rules.c
 LOCAL_C_INCLUDES := selinux/libsepol/include/
 LOCAL_CFLAGS += -std=gnu11
 include $(BUILD_EXECUTABLE)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := resetprop
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := resetprop/resetprop.cpp resetprop/system_properties.cpp resetprop/libc_logging.cpp
+LOCAL_LDLIBS += -latomic
+include $(BUILD_EXECUTABLE)
+
 include selinux/libsepol/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index d26f2413a..4d8c58092 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,3 +1,5 @@
 APP_ABI := x86 x86_64 armeabi arm64-v8a
 APP_PIE = true
 APP_PLATFORM := android-21
+APP_CPPFLAGS += -std=c++11
+# APP_STL := c++_static
diff --git a/jni/resetprop b/jni/resetprop
new file mode 160000
index 000000000..6b77de934
--- /dev/null
+++ b/jni/resetprop
@@ -0,0 +1 @@
+Subproject commit 6b77de934dd13f77f3e1f8345d77a520d2e9b491