Merge magiskpolicy, magiskhide, resetprop, magisksu

jni/Android.mk

@@ -2,20 +2,39 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := magisk
-LOCAL_STATIC_LIBRARIES := libselinux libsepol
+LOCAL_STATIC_LIBRARIES := libselinux libsepol libsqlite3
 
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/utils \
 	$(LOCAL_PATH)/selinux/libselinux/include \
-	$(LOCAL_PATH)/selinux/libsepol/include
+	$(LOCAL_PATH)/selinux/libsepol/include \
+	$(LOCAL_PATH)/sqlite3
 
 LOCAL_SRC_FILES := \
 	main.c \
 	utils/log_monitor.c \
 	utils/vector.c \
-	utils/xwrap.c
+	utils/xwrap.c \
+	magiskhide/magiskhide.c \
+	magiskhide/hide.c \
+	magiskhide/list_monitor.c \
+	magiskhide/proc_monitor.c \
+	magiskhide/util.c \
+	magiskpolicy/magiskpolicy.c \
+	magiskpolicy/rules.c \
+	magiskpolicy/sepolicy.c \
+	magiskpolicy/utils.c \
+	resetprop/resetprop.cpp \
+	resetprop/libc_logging.cpp \
+	resetprop/system_properties.cpp \
+	su/su.c \
+	su/daemon.c \
+	su/activity.c \
+	su/db.c \
+	su/utils.c \
+	su/pts.c
 
-LOCAL_CFLAGS := -static
+LOCAL_CFLAGS := -static -Wno-implicit-exception-spec-mismatch
 LOCAL_LDLIBS := -llog
 
 include $(BUILD_EXECUTABLE)
@@ -23,12 +42,17 @@ include $(BUILD_EXECUTABLE)
 # Libraries
 include jni/selinux/libselinux/Android.mk
 include jni/selinux/libsepol/Android.mk
+include jni/sqlite3/Android.mk
 
-# Enable these for seperate binaries
-# By default, we create a unified binary
-
-# include jni/magiskboot/Android.mk
+#####################################################################
+# In order to build separate binaries, please comment out everything 
+# starting from line 3 (including the 3 lines for libraries)
+# Then, uncomment the line you want below
+#####################################################################
 # include jni/magiskhide/Android.mk
 # include jni/resetprop/Android.mk
 # include jni/magiskpolicy/Android.mk
 # include jni/su/Android.mk
+
+# Build magiskboot
+# include jni/magiskboot/Android.mk