Restructure native codebase

native/jni/Android.mk

@@ -9,7 +9,7 @@ ifdef B_MAGISK
 include $(CLEAR_VARS)
 LOCAL_MODULE := magisk
 LOCAL_STATIC_LIBRARIES := \
-    libutils \
+    libbase \
     libnanopb \
     libsystemproperties \
     libphmap \
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := \
     core/bootstages.cpp \
     core/socket.cpp \
     core/db.cpp \
+    core/cert.cpp \
     core/scripting.cpp \
     core/restorecon.cpp \
     core/module.cpp \
@@ -33,7 +34,6 @@ LOCAL_SRC_FILES := \
     su/su.cpp \
     su/connect.cpp \
     su/pts.cpp \
-    su/cert.cpp \
     su/su_daemon.cpp \
     zygisk/entry.cpp \
     zygisk/main.cpp \
@@ -64,7 +64,8 @@ ifdef B_INIT
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskinit
 LOCAL_STATIC_LIBRARIES := \
-    libutilx \
+    libbase \
+    libcompat \
     libpolicy \
     libxz
 
@@ -86,7 +87,8 @@ ifdef B_BOOT
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskboot
 LOCAL_STATIC_LIBRARIES := \
-    libutilx \
+    libbase \
+    libcompat \
     libmincrypt \
     liblzma \
     liblz4 \
@@ -96,15 +98,15 @@ LOCAL_STATIC_LIBRARIES := \
     libzopfli
 
 LOCAL_SRC_FILES := \
-    magiskboot/main.cpp \
+    boot/main.cpp \
-    magiskboot/bootimg.cpp \
+    boot/bootimg.cpp \
-    magiskboot/hexpatch.cpp \
+    boot/hexpatch.cpp \
-    magiskboot/compress.cpp \
+    boot/compress.cpp \
-    magiskboot/format.cpp \
+    boot/format.cpp \
-    magiskboot/dtb.cpp \
+    boot/dtb.cpp \
-    magiskboot/ramdisk.cpp \
+    boot/ramdisk.cpp \
-    magiskboot/pattern.cpp \
+    boot/pattern.cpp \
-    magiskboot/cpio.cpp
+    boot/cpio.cpp
 
 LOCAL_LDFLAGS := -static
 include $(BUILD_EXECUTABLE)
@@ -116,10 +118,11 @@ ifdef B_POLICY
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskpolicy
 LOCAL_STATIC_LIBRARIES := \
-    libutils \
+    libbase \
+    libbase \
     libpolicy
 
-LOCAL_SRC_FILES := magiskpolicy/main.cpp
+LOCAL_SRC_FILES := sepolicy/main.cpp
 
 include $(BUILD_EXECUTABLE)
 
@@ -130,7 +133,8 @@ ifdef B_PROP
 include $(CLEAR_VARS)
 LOCAL_MODULE := resetprop
 LOCAL_STATIC_LIBRARIES := \
-    libutilx \
+    libbase \
+    libcompat \
     libnanopb \
     libsystemproperties
 
@@ -151,7 +155,7 @@ ifneq (,$(wildcard jni/test.cpp))
 include $(CLEAR_VARS)
 LOCAL_MODULE := test
 LOCAL_STATIC_LIBRARIES := \
-    libutils \
+    libbase \
     libphmap
 
 LOCAL_SRC_FILES := test.cpp
@@ -167,19 +171,19 @@ endif
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libpolicy
 LOCAL_STATIC_LIBRARIES := \
-    libutils \
+    libbase \
     libsepol
-LOCAL_C_INCLUDES := jni/magiskpolicy jni/magiskpolicy/include
+LOCAL_C_INCLUDES := jni/sepolicy/include
-LOCAL_EXPORT_C_INCLUDES := jni/magiskpolicy/include
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 LOCAL_SRC_FILES := \
-    magiskpolicy/api.cpp \
+    sepolicy/api.cpp \
-    magiskpolicy/sepolicy.cpp \
+    sepolicy/sepolicy.cpp \
-    magiskpolicy/rules.cpp \
+    sepolicy/rules.cpp \
-    magiskpolicy/policydb.cpp \
+    sepolicy/policydb.cpp \
-    magiskpolicy/statement.cpp
+    sepolicy/statement.cpp
 include $(BUILD_STATIC_LIBRARY)
 
-include jni/utils/Android.mk
+include jni/base/Android.mk
 include jni/external/Android.mk
 
 ifdef B_BB

native/jni/base/Android.mk

@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 # Magisk project-wide common code
 
 include $(CLEAR_VARS)
-LOCAL_MODULE:= libutils
+LOCAL_MODULE:= libbase
 LOCAL_C_INCLUDES := jni/include $(LOCAL_PATH)/include out/generated
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 LOCAL_EXPORT_STATIC_LIBRARIES := libcxx
@@ -18,15 +18,10 @@ LOCAL_SRC_FILES := \
     stream.cpp
 include $(BUILD_STATIC_LIBRARY)
 
-# libutils + "hacky" libc.a missing symbols
+# Workaround "hacky" libc.a missing symbols
-
+# To build Magisk with vanilla NDK, remove all usage of libcompat
-# To build Magisk with vanilla NDK, simply
-# remove compat.cpp from sources, or replace
-# all usage of libutilx to libutils
 
 include $(CLEAR_VARS)
-LOCAL_MODULE:= libutilx
+LOCAL_MODULE:= libcompat
-LOCAL_EXPORT_STATIC_LIBRARIES := libutils
-LOCAL_STATIC_LIBRARIES := libutils
 LOCAL_SRC_FILES := compat/compat.cpp
 include $(BUILD_STATIC_LIBRARY)

native/jni/base/compat/compat.cpp

@@ -1,9 +1,9 @@
 // This file implements all missing symbols that should exist in normal API 21
 // libc.a but missing in our extremely lean libc.a replacements.
 
-#include <cstdlib>
+#include <stdlib.h>
-#include <cstring>
+#include <string.h>
-#include <cerrno>
+#include <errno.h>
 #include <mntent.h>
 #include <unistd.h>
 #include <fcntl.h>

native/jni/base/compat/fortify.hpp

@@ -4,14 +4,14 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <logging.hpp>
-
 #undef _FORTIFY_SOURCE
 
+extern int __vloge(const char* fmt, va_list ap);
+
 static inline __noreturn __printflike(1, 2) void __fortify_fatal(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
-    log_cb.e(fmt, args);
+    __vloge(fmt, args);
     va_end(args);
     abort();
 }

native/jni/base/files.cpp

@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <libgen.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <selinux.hpp>
 
 using namespace std;

native/jni/base/logging.cpp

@@ -55,3 +55,8 @@ void LOGD(const char *fmt, ...) {}
 void LOGI(const char *fmt, ...) { LOG_BODY(i) }
 void LOGW(const char *fmt, ...) { LOG_BODY(w) }
 void LOGE(const char *fmt, ...) { LOG_BODY(e); log_cb.ex(EXIT_FAILURE); }
+
+// Export raw symbol to fortify compat
+extern "C" int __vloge(const char* fmt, va_list ap) {
+    return log_cb.e(fmt, ap);
+}

native/jni/base/misc.cpp

@@ -9,7 +9,7 @@
 #include <random>
 #include <string>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 using namespace std;
 

native/jni/base/selinux.cpp

@@ -2,7 +2,7 @@
 #include <sys/syscall.h>
 #include <sys/xattr.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <selinux.hpp>
 
 using namespace std;

native/jni/base/stream.cpp

@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <cstddef>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <stream.hpp>
 
 using namespace std;

native/jni/base/xwrap.cpp

@@ -10,7 +10,7 @@
 #include <sys/ptrace.h>
 #include <sys/inotify.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 using namespace std;
 

native/jni/boot/bootimg.cpp

@@ -4,7 +4,7 @@
 #include <libfdt.h>
 #include <mincrypt/sha.h>
 #include <mincrypt/sha256.h>
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "bootimg.hpp"
 #include "magiskboot.hpp"

native/jni/boot/compress.cpp

@@ -10,7 +10,7 @@
 #include <zopfli/util.h>
 #include <zopfli/deflate.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "magiskboot.hpp"
 #include "compress.hpp"

native/jni/boot/cpio.cpp

@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <algorithm>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "cpio.hpp"
 

native/jni/boot/dtb.cpp

@@ -3,7 +3,7 @@
 #include <map>
 #include <libfdt.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "magiskboot.hpp"
 #include "dtb.hpp"

native/jni/boot/hexpatch.cpp

@@ -1,6 +1,6 @@
 #include <sys/mman.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "magiskboot.hpp"
 

native/jni/boot/main.cpp

@@ -1,5 +1,5 @@
 #include <mincrypt/sha.h>
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "magiskboot.hpp"
 #include "compress.hpp"

native/jni/boot/pattern.cpp

@@ -1,4 +1,4 @@
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "magiskboot.hpp"
 

native/jni/boot/ramdisk.cpp

@@ -1,4 +1,4 @@
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "cpio.hpp"
 #include "magiskboot.hpp"

native/jni/core/applet_stub.cpp

@@ -1,7 +1,7 @@
 #include <sys/stat.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 int main(int argc, char *argv[]) {
     umask(0);

native/jni/core/applets.cpp

@@ -4,7 +4,7 @@
 
 #include <magisk.hpp>
 #include <selinux.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 using namespace std;
 

native/jni/core/bootstages.cpp

@@ -8,7 +8,7 @@
 
 #include <magisk.hpp>
 #include <db.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <daemon.hpp>
 #include <resetprop.hpp>
 #include <selinux.hpp>

native/jni/core/cert.cpp

@@ -1,4 +1,4 @@
-#include <utils.hpp>
+#include <base.hpp>
 
 using namespace std;
 

native/jni/core/daemon.cpp

@@ -4,7 +4,7 @@
 #include <sys/mount.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <daemon.hpp>
 #include <selinux.hpp>
 #include <db.hpp>

native/jni/core/db.cpp

@@ -5,7 +5,7 @@
 #include <magisk.hpp>
 #include <db.hpp>
 #include <socket.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 #define DB_VERSION 12
 

native/jni/core/logging.cpp

@@ -2,7 +2,7 @@
 #include <android/log.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <daemon.hpp>
 #include <stream.hpp>
 

native/jni/core/magisk.cpp

@@ -1,7 +1,7 @@
 #include <sys/mount.h>
 #include <libgen.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <magisk.hpp>
 #include <daemon.hpp>
 #include <selinux.hpp>

native/jni/core/module.cpp

@@ -2,7 +2,7 @@
 #include <map>
 #include <utility>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <magisk.hpp>
 #include <daemon.hpp>
 #include <selinux.hpp>

native/jni/core/restorecon.cpp

@@ -2,7 +2,7 @@
 
 #include <magisk.hpp>
 #include <selinux.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 using namespace std;
 

native/jni/core/scripting.cpp

@@ -3,7 +3,7 @@
 #include <sys/wait.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <selinux.hpp>
 #include <daemon.hpp>
 

native/jni/core/socket.cpp

@@ -2,7 +2,7 @@
 #include <endian.h>
 
 #include <socket.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 using namespace std;
 

native/jni/core/thread.cpp

@@ -1,6 +1,6 @@
 // Cached thread pool implementation
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include <daemon.hpp>
 

native/jni/init/getinfo.cpp

@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <vector>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "init.hpp"
 

native/jni/init/init.cpp

@@ -5,7 +5,7 @@
 
 #include <xz.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <binaries.h>
 
 #if defined(__arm__)

native/jni/init/init.hpp

@@ -1,4 +1,4 @@
-#include <utils.hpp>
+#include <base.hpp>
 
 using kv_pairs = std::vector<std::pair<std::string, std::string>>;
 

native/jni/init/mount.cpp

@@ -2,7 +2,7 @@
 #include <sys/sysmacros.h>
 #include <libgen.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <selinux.hpp>
 #include <magisk.hpp>
 

native/jni/init/rootdir.cpp

@@ -2,7 +2,7 @@
 #include <libgen.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "init.hpp"
 #include "magiskrc.inc"

native/jni/init/selinux.cpp

@@ -2,7 +2,7 @@
 
 #include <magisk.hpp>
 #include <sepolicy.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "init.hpp"
 

native/jni/init/twostage.cpp

@@ -1,7 +1,7 @@
 #include <sys/mount.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <socket.hpp>
 
 #include "init.hpp"

native/jni/resetprop/persist.cpp

@@ -2,9 +2,9 @@
 #include <pb_decode.h>
 #include <pb_encode.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 
-#include "_resetprop.hpp"
+#include "prop.hpp"
 
 using namespace std;
 

native/jni/resetprop/resetprop.cpp

@@ -4,12 +4,12 @@
 #include <map>
 
 #include <resetprop.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
 #include <_system_properties.h>
 
-#include "_resetprop.hpp"
+#include "prop.hpp"
 
 using namespace std;
 

native/jni/sepolicy/api.cpp

@@ -1,4 +1,4 @@
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "policy.hpp"
 

native/jni/sepolicy/main.cpp

@@ -1,4 +1,4 @@
-#include <utils.hpp>
+#include <base.hpp>
 #include <vector>
 
 #include "policy.hpp"

native/jni/sepolicy/policy.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-// libse internal APIs, do not use directly
+// Internal APIs, do not use directly
 
 #include <sepol/policydb/policydb.h>
 #include <sepolicy.hpp>

native/jni/sepolicy/policydb.cpp

@@ -5,7 +5,7 @@
 
 #include <cil/cil.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <stream.hpp>
 
 #include "policy.hpp"

native/jni/sepolicy/rules.cpp

@@ -1,4 +1,4 @@
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "policy.hpp"
 

native/jni/sepolicy/sepolicy.cpp

@@ -1,4 +1,4 @@
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "policy.hpp"
 

native/jni/sepolicy/statement.cpp

@@ -2,7 +2,7 @@
 #include <vector>
 #include <string>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "policy.hpp"
 

native/jni/su/connect.cpp

@@ -1,7 +1,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <selinux.hpp>
 
 #include "su.hpp"

native/jni/su/pts.cpp

@@ -13,7 +13,7 @@
 #include <fcntl.h>
 #include <termios.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "pts.hpp"
 

native/jni/su/su.cpp

@@ -15,7 +15,7 @@
 
 #include <magisk.hpp>
 #include <daemon.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <flags.h>
 
 #include "su.hpp"

native/jni/su/su_daemon.cpp

@@ -7,7 +7,7 @@
 
 #include <daemon.hpp>
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <selinux.hpp>
 #include <db.hpp>
 

native/jni/zygisk/deny/cli.cpp

@@ -2,7 +2,7 @@
 #include <sys/mount.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "deny.hpp"
 

native/jni/zygisk/deny/revert.cpp

@@ -1,7 +1,7 @@
 #include <sys/mount.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "deny.hpp"
 

native/jni/zygisk/deny/utils.cpp

@@ -7,7 +7,7 @@
 #include <set>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <db.hpp>
 
 #include "deny.hpp"

native/jni/zygisk/entry.cpp

@@ -4,7 +4,7 @@
 #include <android/log.h>
 #include <android/dlext.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <daemon.hpp>
 #include <magisk.hpp>
 #include <db.hpp>

native/jni/zygisk/hook.cpp

@@ -5,7 +5,7 @@
 
 #include <xhook.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 #include <flags.h>
 #include <daemon.hpp>
 

native/jni/zygisk/main.cpp

@@ -3,7 +3,7 @@
 #include <dlfcn.h>
 
 #include <magisk.hpp>
-#include <utils.hpp>
+#include <base.hpp>
 #include <socket.hpp>
 #include <daemon.hpp>
 

native/jni/zygisk/memory.hpp

@@ -3,7 +3,7 @@
 #include <map>
 #include <parallel_hashmap/phmap.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 namespace jni_hook {
 

native/jni/zygisk/ptrace.cpp

@@ -22,7 +22,7 @@
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "zygisk.hpp"
 #include "ptrace.hpp"

native/jni/zygisk/utils.cpp

@@ -1,5 +1,5 @@
 #include <cinttypes>
-#include <utils.hpp>
+#include <base.hpp>
 
 #include "zygisk.hpp"