From 7244c02a0d155dd74c72d32479c99d5947a4f8c4 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sat, 28 Oct 2017 16:11:01 +0800 Subject: [PATCH] Small adjustments --- jni/Android.mk | 1 - jni/daemon/log_monitor.c | 3 --- jni/utils/img.c | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index b618e05e8..e09f0c484 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,7 +1,6 @@ LOCAL_PATH := $(call my-dir) # Some handy paths -JNI_ROOT := jni EXT_PATH := jni/external SE_PATH := $(EXT_PATH)/selinux LIBSELINUX := $(SE_PATH)/libselinux/include diff --git a/jni/daemon/log_monitor.c b/jni/daemon/log_monitor.c index 61561dfc7..40aa4c16c 100644 --- a/jni/daemon/log_monitor.c +++ b/jni/daemon/log_monitor.c @@ -140,10 +140,7 @@ void stop_debug_full_log() { // Stop recording the boot logcat after every boot task is done kill(debug_log_pid, SIGTERM); waitpid(debug_log_pid, NULL, 0); - pthread_t thread; // Start debug thread - xpthread_create(&thread, NULL, debug_magisk_log_thread, NULL); - pthread_detach(thread); start_debug_log(); #endif } diff --git a/jni/utils/img.c b/jni/utils/img.c index ea5fb5f31..38ad78f8d 100644 --- a/jni/utils/img.c +++ b/jni/utils/img.c @@ -137,9 +137,9 @@ char *mount_image(const char *img, const char *target) { if (access(img, F_OK) == -1) return NULL; if (access(target, F_OK) == -1) { - if (xmkdir(target, 0755) == -1) { + if (xmkdir_p(target, 0755) == -1) { xmount(NULL, "/", NULL, MS_REMOUNT, NULL); - xmkdir(target, 0755); + xmkdir_p(target, 0755); xmount(NULL, "/", NULL, MS_REMOUNT | MS_RDONLY, NULL); } }