diff --git a/jni/Android.mk b/jni/Android.mk index 386bcc76c..16c89cc2c 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -13,7 +13,8 @@ LOCAL_SHARED_LIBRARIES := libsqlite libselinux LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/external \ - $(LOCAL_PATH)/selinux/libsepol/include + $(LOCAL_PATH)/selinux/libsepol/include \ + $(LOCAL_PATH)/selinux/libsepol/cil/include LOCAL_SRC_FILES := \ daemon/magisk.c \ @@ -32,6 +33,7 @@ LOCAL_SRC_FILES := \ magiskpolicy/magiskpolicy.c \ magiskpolicy/rules.c \ magiskpolicy/sepolicy.c \ + magiskpolicy/secilc.c \ magiskpolicy/api.c \ resetprop/resetprop.cpp \ resetprop/system_properties.cpp \ diff --git a/jni/daemon/magisk.c b/jni/daemon/magisk.c index b3f1bcafb..ab5dd9a90 100644 --- a/jni/daemon/magisk.c +++ b/jni/daemon/magisk.c @@ -11,10 +11,10 @@ char *argv0; char *applet[] = - { "su", "resetprop", "magiskpolicy", "supolicy", "sepolicy-inject", "magiskhide", NULL }; + { "su", "resetprop", "magisksecilc", "magiskpolicy", "supolicy", "sepolicy-inject", "magiskhide", NULL }; int (*applet_main[]) (int, char *[]) = - { su_client_main, resetprop_main, magiskpolicy_main, magiskpolicy_main, magiskpolicy_main, magiskhide_main, NULL }; + { su_client_main, resetprop_main, secilc_main, magiskpolicy_main, magiskpolicy_main, magiskpolicy_main, magiskhide_main, NULL }; // Global error hander function // Should be changed each thread/process diff --git a/jni/include/magisk.h b/jni/include/magisk.h index 6793e58bb..83a76e670 100644 --- a/jni/include/magisk.h +++ b/jni/include/magisk.h @@ -79,6 +79,7 @@ extern int (*applet_main[]) (int, char *[]); int magiskhide_main(int argc, char *argv[]); int magiskpolicy_main(int argc, char *argv[]); int su_client_main(int argc, char *argv[]); +int secilc_main(int argc, char *argv[]); #ifdef __cplusplus extern "C" { diff --git a/jni/magiskpolicy b/jni/magiskpolicy index 3c6a17013..6600772dc 160000 --- a/jni/magiskpolicy +++ b/jni/magiskpolicy @@ -1 +1 @@ -Subproject commit 3c6a170138cacb1f817c65181bd6e3ef15cfca9e +Subproject commit 6600772dca2c02a2528429759aeb7856361bfcb4 diff --git a/jni/selinux b/jni/selinux index 3d9b8bcb0..2fefdfc40 160000 --- a/jni/selinux +++ b/jni/selinux @@ -1 +1 @@ -Subproject commit 3d9b8bcb0561e8b2fd8cf54b150e458d35c73a18 +Subproject commit 2fefdfc40fe5e675253fcaf03558ca3dca0a0550