Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
7244c02a
Commit
7244c02a
authored
Oct 28, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small adjustments
parent
6c229ffa
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
6 deletions
+2
-6
Android.mk
jni/Android.mk
+0
-1
log_monitor.c
jni/daemon/log_monitor.c
+0
-3
img.c
jni/utils/img.c
+2
-2
No files found.
jni/Android.mk
View file @
7244c02a
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
...
...
jni/daemon/log_monitor.c
View file @
7244c02a
...
@@ -140,10 +140,7 @@ void stop_debug_full_log() {
...
@@ -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
}
}
...
...
jni/utils/img.c
View file @
7244c02a
...
@@ -137,9 +137,9 @@ char *mount_image(const char *img, const char *target) {
...
@@ -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
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment