tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove APEX sepolicy support am: e9448817b3 am: befd9372d7 am: 298608b246 am: 61ac3b9137

Browse source 
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2736178

Change-Id: I25227cf516e7a4799a4cbea23740cddbfac53919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thiébaud Weksteen 2023-09-06 08:43:01 +00:00 committed by Automerger Merge Worker
commit 32eb7e6bc4
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libselinux/src/android/android.c
View file

@ -21,9 +21,6 @@ static const path_alts_t service_context_paths = { .paths = {
"/system/etc/selinux/plat_service_contexts", "/system/etc/selinux/plat_service_contexts",
"/plat_service_contexts" "/plat_service_contexts"
}, },
{
"/dev/selinux/apex_service_contexts"
},
{ {
"/system_ext/etc/selinux/system_ext_service_contexts", "/system_ext/etc/selinux/system_ext_service_contexts",
"/system_ext_service_contexts" "/system_ext_service_contexts"

4
libselinux/src/android/android_internal.h
View file

@ -11,8 +11,8 @@ extern "C" {
#endif #endif
// Context files (file_contexts, service_contexts, etc) may be spread over // Context files (file_contexts, service_contexts, etc) may be spread over
// multiple partitions: system, apex, system_ext, product, vendor and/or odm. // multiple partitions: system, system_ext, product, vendor and/or odm.
#define MAX_CONTEXT_PATHS 6 #define MAX_CONTEXT_PATHS 5
// The maximum number of alternatives for a file on one partition. // The maximum number of alternatives for a file on one partition.
#define MAX_ALT_CONTEXT_PATHS 2 #define MAX_ALT_CONTEXT_PATHS 2
typedef struct path_alts { typedef struct path_alts {

7
libselinux/src/android/android_seapp.c
View file

@ -27,9 +27,6 @@ static const path_alts_t file_context_paths = { .paths = {
"/system/etc/selinux/plat_file_contexts", "/system/etc/selinux/plat_file_contexts",
"/plat_file_contexts" "/plat_file_contexts"
}, },
{
"/dev/selinux/apex_file_contexts",
},
{ {
"/system_ext/etc/selinux/system_ext_file_contexts", "/system_ext/etc/selinux/system_ext_file_contexts",
"/system_ext_file_contexts" "/system_ext_file_contexts"
@ -61,9 +58,6 @@ static const path_alts_t seapp_context_paths = { .paths = {
"/system/etc/selinux/plat_seapp_contexts", "/system/etc/selinux/plat_seapp_contexts",
"/plat_seapp_contexts" "/plat_seapp_contexts"
}, },
{
"/dev/selinux/apex_seapp_contexts",
},
{ {
"/system_ext/etc/selinux/system_ext_seapp_contexts", "/system_ext/etc/selinux/system_ext_seapp_contexts",
"/system_ext_seapp_contexts" "/system_ext_seapp_contexts"
@ -82,7 +76,6 @@ static const path_alts_t seapp_context_paths = { .paths = {
} }
}, .partitions= { }, .partitions= {
"system", "system",
"system", // regard APEX sepolicy as system
"system_ext", "system_ext",
"product", "product",
"vendor", "vendor",