From 5bac442b1847c80823c2b08567c317f6883cee4f Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 10 Aug 2018 00:40:23 +0800
Subject: [PATCH] Reorganize sources

---
 native/jni/Android.mk                      | 23 +++++++++++-----------
 native/jni/core/bootstages.c               |  1 +
 native/jni/include/img.h                   | 11 +++++++++++
 native/jni/include/utils.h                 | 14 -------------
 native/jni/{utils => magiskboot}/cpio.c    |  0
 native/jni/{include => magiskboot}/cpio.h  |  0
 native/jni/magiskboot/magiskboot.h         |  4 ++++
 native/jni/{utils => magiskboot}/pattern.c |  1 +
 native/jni/utils/img.c                     |  1 +
 9 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 native/jni/include/img.h
 rename native/jni/{utils => magiskboot}/cpio.c (100%)
 rename native/jni/{include => magiskboot}/cpio.h (100%)
 rename native/jni/{utils => magiskboot}/pattern.c (98%)

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index bf49a9419..ccfcad471 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -10,14 +10,12 @@ LIBLZ4 := $(EXT_PATH)/lz4/lib
 LIBBZ2 := $(EXT_PATH)/bzip2
 LIBFDT := $(EXT_PATH)/dtc/libfdt
 LIBNANOPB := $(EXT_PATH)/nanopb
-UTIL_SRC := utils/cpio.c \
-            utils/file.c \
-            utils/img.c \
-            utils/list.c \
-            utils/misc.c \
-            utils/pattern.c \
-            utils/vector.c \
-            utils/xwrap.c
+COMMON_UTILS := \
+	utils/file.c \
+	utils/list.c \
+	utils/misc.c \
+	utils/vector.c \
+	utils/xwrap.c
 
 ########################
 # Binaries
@@ -55,7 +53,8 @@ LOCAL_SRC_FILES := \
 	su/pts.c \
 	su/su_daemon.c \
 	su/su_socket.c \
-	$(UTIL_SRC)
+	utils/img.c \
+	$(COMMON_UTILS)
 
 LOCAL_CFLAGS := -DIS_DAEMON -DSELINUX
 LOCAL_LDLIBS := -llog
@@ -83,7 +82,7 @@ LOCAL_SRC_FILES := \
 	magiskpolicy/magiskpolicy.c \
 	magiskpolicy/rules.c \
 	magiskpolicy/sepolicy.c \
-	$(UTIL_SRC)
+	$(COMMON_UTILS)
 
 LOCAL_LDFLAGS := -static
 include $(BUILD_EXECUTABLE)
@@ -105,6 +104,7 @@ LOCAL_C_INCLUDES := \
 	$(LIBFDT)
 
 LOCAL_SRC_FILES := \
+	magiskboot/cpio.c \
 	magiskboot/main.c \
 	magiskboot/bootimg.c \
 	magiskboot/hexpatch.c \
@@ -112,7 +112,8 @@ LOCAL_SRC_FILES := \
 	magiskboot/format.c \
 	magiskboot/dtb.c \
 	magiskboot/ramdisk.c \
-	$(UTIL_SRC)
+	magiskboot/pattern.c \
+	$(COMMON_UTILS)
 
 LOCAL_CFLAGS := -DXWRAP_EXIT
 LOCAL_LDLIBS := -lz
diff --git a/native/jni/core/bootstages.c b/native/jni/core/bootstages.c
index e8daee5ca..69f6daef1 100644
--- a/native/jni/core/bootstages.c
+++ b/native/jni/core/bootstages.c
@@ -18,6 +18,7 @@
 #include "magisk.h"
 #include "db.h"
 #include "utils.h"
+#include "img.h"
 #include "daemon.h"
 #include "resetprop.h"
 #include "magiskpolicy.h"
diff --git a/native/jni/include/img.h b/native/jni/include/img.h
new file mode 100644
index 000000000..089b9b2c1
--- /dev/null
+++ b/native/jni/include/img.h
@@ -0,0 +1,11 @@
+#ifndef IMG_H
+#define IMG_H
+
+int create_img(const char *img, int size);
+int resize_img(const char *img, int size);
+char *mount_image(const char *img, const char *target);
+int umount_image(const char *target, const char *device);
+int merge_img(const char *source, const char *target);
+int trim_img(const char *img, const char *mount, char *loop);
+
+#endif //IMG_H
diff --git a/native/jni/include/utils.h b/native/jni/include/utils.h
index 2e24166b8..f9875413d 100644
--- a/native/jni/include/utils.h
+++ b/native/jni/include/utils.h
@@ -147,18 +147,4 @@ void full_read_at(int dirfd, const char *filename, void **buf, size_t *size);
 void stream_full_read(int fd, void **buf, size_t *size);
 void write_zero(int fd, size_t size);
 
-// img.c
-
-int create_img(const char *img, int size);
-int resize_img(const char *img, int size);
-char *mount_image(const char *img, const char *target);
-int umount_image(const char *target, const char *device);
-int merge_img(const char *source, const char *target);
-int trim_img(const char *img, const char *mount, char *loop);
-
-// pattern.c
-
-int patch_verity(void **buf, uint32_t *size, int patch);
-void patch_encryption(void **buf, uint32_t *size);
-
 #endif
diff --git a/native/jni/utils/cpio.c b/native/jni/magiskboot/cpio.c
similarity index 100%
rename from native/jni/utils/cpio.c
rename to native/jni/magiskboot/cpio.c
diff --git a/native/jni/include/cpio.h b/native/jni/magiskboot/cpio.h
similarity index 100%
rename from native/jni/include/cpio.h
rename to native/jni/magiskboot/cpio.h
diff --git a/native/jni/magiskboot/magiskboot.h b/native/jni/magiskboot/magiskboot.h
index 8b3bb3284..992e0c0e8 100644
--- a/native/jni/magiskboot/magiskboot.h
+++ b/native/jni/magiskboot/magiskboot.h
@@ -32,4 +32,8 @@ size_t lz4_legacy(int mode, int fd, const void *buf, size_t size);
 long long comp(format_t type, int to, const void *from, size_t size);
 long long decomp(format_t type, int to, const void *from, size_t size);
 
+// Pattern
+int patch_verity(void **buf, uint32_t *size, int patch);
+void patch_encryption(void **buf, uint32_t *size);
+
 #endif
diff --git a/native/jni/utils/pattern.c b/native/jni/magiskboot/pattern.c
similarity index 98%
rename from native/jni/utils/pattern.c
rename to native/jni/magiskboot/pattern.c
index a7e09410a..76a0c693f 100644
--- a/native/jni/utils/pattern.c
+++ b/native/jni/magiskboot/pattern.c
@@ -2,6 +2,7 @@
 #include <string.h>
 
 #include "utils.h"
+#include "magiskboot.h"
 
 static int check_verity_pattern(const char *s) {
 	int skip = 0;
diff --git a/native/jni/utils/img.c b/native/jni/utils/img.c
index b10b9b3c1..27fa0059f 100644
--- a/native/jni/utils/img.c
+++ b/native/jni/utils/img.c
@@ -14,6 +14,7 @@
 
 #include "magisk.h"
 #include "utils.h"
+#include "img.h"
 
 #define round_size(a) ((((a) / 32) + 2) * 32)
 #define SOURCE_TMP "/dev/.img_src"