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
3bf47a68
Commit
3bf47a68
authored
Jan 30, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update selinux
parent
d3d28f06
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
Android.mk
native/jni/Android.mk
+1
-2
Android.mk
native/jni/external/Android.mk
+4
-3
selinux
native/jni/external/selinux
+1
-1
policydb.cpp
native/jni/magiskpolicy/policydb.cpp
+1
-1
No files found.
native/jni/Android.mk
View file @
3bf47a68
...
...
@@ -43,10 +43,9 @@ include $(BUILD_EXECUTABLE)
endif
include $(CLEAR_VARS)
ifdef B_INIT
include $(CLEAR_VARS)
LOCAL_MODULE := magiskinit
LOCAL_STATIC_LIBRARIES := libsepol libxz libutils
...
...
native/jni/external/Android.mk
View file @
3bf47a68
...
...
@@ -191,7 +191,6 @@ LOCAL_SRC_FILES := \
selinux/libsepol/src/context.c \
selinux/libsepol/src/context_record.c \
selinux/libsepol/src/debug.c \
selinux/libsepol/src/deprecated_funcs.c \
selinux/libsepol/src/ebitmap.c \
selinux/libsepol/src/expand.c \
selinux/libsepol/src/handle.c \
...
...
@@ -217,9 +216,9 @@ LOCAL_SRC_FILES := \
selinux/libsepol/src/policydb.c \
selinux/libsepol/src/policydb_convert.c \
selinux/libsepol/src/policydb_public.c \
selinux/libsepol/src/policydb_validate.c \
selinux/libsepol/src/port_record.c \
selinux/libsepol/src/ports.c \
selinux/libsepol/src/roles.c \
selinux/libsepol/src/services.c \
selinux/libsepol/src/sidtab.c \
selinux/libsepol/src/symtab.c \
...
...
@@ -246,7 +245,9 @@ LOCAL_SRC_FILES := \
selinux/libsepol/cil/src/cil_strpool.c \
selinux/libsepol/cil/src/cil_symtab.c \
selinux/libsepol/cil/src/cil_tree.c \
selinux/libsepol/cil/src/cil_verify.c
selinux/libsepol/cil/src/cil_verify.c \
selinux/libsepol/cil/src/cil_write_ast.c
LOCAL_CFLAGS := -Dgetline=__getline -Wno-implicit-function-declaration
include $(BUILD_STATIC_LIBRARY)
...
...
selinux
@
d0f58237
Subproject commit
969114cff6ee973f47a3c84cacdef77e504d7bd9
Subproject commit
d0f582372b0bafe0fe0cf7bb12f9e88857d65b92
native/jni/magiskpolicy/policydb.cpp
View file @
3bf47a68
...
...
@@ -110,7 +110,7 @@ sepolicy *sepolicy::compile_split() {
#if MAGISK_DEBUG
cil_set_log_level
(
CIL_INFO
);
#endif
cil_set_log_handler
(
+
[](
int
lvl
,
c
har
*
msg
)
{
cil_set_log_handler
(
+
[](
int
lvl
,
c
onst
char
*
msg
)
{
if
(
lvl
==
CIL_ERR
)
{
LOGE
(
"cil: %s"
,
msg
);
}
else
if
(
lvl
==
CIL_WARN
)
{
...
...
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