MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small adjustments

Browse Source
This commit is contained in:
topjohnwu 2017-10-28 16:11:01 +08:00
parent 6c229ffa68
commit 7244c02a0d
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jni/Android.mk
View File

@ -1,7 +1,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
# Some handy paths # Some handy paths
JNI_ROOT := jni
EXT_PATH := jni/external EXT_PATH := jni/external
SE_PATH := $(EXT_PATH)/selinux SE_PATH := $(EXT_PATH)/selinux
LIBSELINUX := $(SE_PATH)/libselinux/include LIBSELINUX := $(SE_PATH)/libselinux/include

3
jni/daemon/log_monitor.c
View File

@ -140,10 +140,7 @@ void stop_debug_full_log() {
// Stop recording the boot logcat after every boot task is done // Stop recording the boot logcat after every boot task is done
kill(debug_log_pid, SIGTERM); kill(debug_log_pid, SIGTERM);
waitpid(debug_log_pid, NULL, 0); waitpid(debug_log_pid, NULL, 0);
pthread_t thread;
// Start debug thread // Start debug thread
xpthread_create(&thread, NULL, debug_magisk_log_thread, NULL);
pthread_detach(thread);
start_debug_log(); start_debug_log();
#endif #endif
} }

4
jni/utils/img.c
View File

@ -137,9 +137,9 @@ char *mount_image(const char *img, const char *target) {
if (access(img, F_OK) == -1) if (access(img, F_OK) == -1)
return NULL; return NULL;
if (access(target, F_OK) == -1) { if (access(target, F_OK) == -1) {
if (xmkdir(target, 0755) == -1) { if (xmkdir_p(target, 0755) == -1) {
xmount(NULL, "/", NULL, MS_REMOUNT, NULL); xmount(NULL, "/", NULL, MS_REMOUNT, NULL);
xmkdir(target, 0755); xmkdir_p(target, 0755);
xmount(NULL, "/", NULL, MS_REMOUNT | MS_RDONLY, NULL); xmount(NULL, "/", NULL, MS_REMOUNT | MS_RDONLY, NULL);
} }
} }