mirror of
https://github.com/topjohnwu/Magisk.git
synced 2024-11-27 20:15:29 +00:00
Update selinux
This commit is contained in:
parent
d3d28f0623
commit
3bf47a6838
@ -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
|
||||
|
||||
|
7
native/jni/external/Android.mk
vendored
7
native/jni/external/Android.mk
vendored
@ -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)
|
||||
|
||||
|
2
native/jni/external/selinux
vendored
2
native/jni/external/selinux
vendored
@ -1 +1 @@
|
||||
Subproject commit 969114cff6ee973f47a3c84cacdef77e504d7bd9
|
||||
Subproject commit d0f582372b0bafe0fe0cf7bb12f9e88857d65b92
|
@ -110,7 +110,7 @@ sepolicy *sepolicy::compile_split() {
|
||||
#if MAGISK_DEBUG
|
||||
cil_set_log_level(CIL_INFO);
|
||||
#endif
|
||||
cil_set_log_handler(+[](int lvl, char* msg) {
|
||||
cil_set_log_handler(+[](int lvl, const char *msg) {
|
||||
if (lvl == CIL_ERR) {
|
||||
LOGE("cil: %s", msg);
|
||||
} else if (lvl == CIL_WARN) {
|
||||
|
Loading…
Reference in New Issue
Block a user