Cleanup and small fixes

.gitignore

@@ -1,6 +1,4 @@
-/out
-/obj
-/libs
+out
 *.zip
 *.jks
 *.apk

build.py

@@ -58,7 +58,7 @@ def cp(source, target):
 
 def rm(file):
 	try:
-	    os.remove(file)
+		os.remove(file)
 	except OSError as e:
 		if e.errno != errno.ENOENT:
 			raise
@@ -435,8 +435,8 @@ def cleanup(args):
 clean_parser.set_defaults(func=cleanup)
 
 if len(sys.argv) == 1:
-    parser.print_help()
-    sys.exit(1)
+	parser.print_help()
+	sys.exit(1)
 
 args = parser.parse_args()
 

core/.gitignore

@@ -1 +1,3 @@
 /build
+obj
+libs

core/jni/core/bootstages.c

@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <string.h>
 #include <dirent.h>
-#include <linux/loop.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 #include <selinux/selinux.h>

core/jni/core/daemon.c

@@ -8,7 +8,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
-#include <errno.h>
 #include <pthread.h>
 #include <signal.h>
 #include <sys/un.h>

core/jni/core/log_monitor.c

@@ -6,7 +6,6 @@
  */
 
 #include <stdio.h>
-#include <limits.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <sys/wait.h>

core/jni/magiskhide/hide_utils.c

@@ -4,10 +4,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
 #include <dirent.h>
 #include <string.h>
-#include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <selinux/selinux.h>

core/jni/utils/cpio.c

@@ -168,6 +168,7 @@ void cpio_ln(struct vector *v, const char *target, const char *entry) {
 	cpio_entry *f = xcalloc(sizeof(*f), 1);
 	f->mode = S_IFLNK;
 	f->filename = strdup(entry);
+	f->filesize = strlen(target) + 1;
 	f->data = strdup(target);
 	cpio_vec_insert(v, f);
 	fprintf(stderr, "Create symlink [%s] -> [%s]\n", entry, target);

core/jni/utils/list.c

@@ -1,9 +1,6 @@
 /* list.h - Double link list implementation
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "list.h"
 
 void init_list_head(struct list_head *head) {