diff options
| author | Thiébaud Weksteen <tweek@google.com> | 2023-09-06 05:45:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-06 05:45:28 +0000 |
| commit | 298608b2469876422299e7706c84304aa9edd9e9 (patch) | |
| tree | 9572c09bc52b745df7b11a22da0258a55f96ad1d | |
| parent | 7959969e47e4429039541eb63f2a4df52ec13ed4 (diff) | |
| parent | befd9372d7a3afa73011455a6ec00da17cfcf6ea (diff) | |
| download | selinux-298608b2469876422299e7706c84304aa9edd9e9.tar.gz | |
Remove APEX sepolicy support am: e9448817b3 am: befd9372d7
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2736178
Change-Id: I3117e97c5ace1a8b69d869bf189a0e8b751849ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libselinux/src/android/android.c | 3 | ||||
| -rw-r--r-- | libselinux/src/android/android_internal.h | 4 | ||||
| -rw-r--r-- | libselinux/src/android/android_seapp.c | 7 |
3 files changed, 2 insertions, 12 deletions
diff --git a/libselinux/src/android/android.c b/libselinux/src/android/android.c index 4e330599..83066118 100644 --- a/libselinux/src/android/android.c +++ b/libselinux/src/android/android.c @@ -22,9 +22,6 @@ static const path_alts_t service_context_paths = { .paths = { "/plat_service_contexts" }, { - "/dev/selinux/apex_service_contexts" - }, - { "/system_ext/etc/selinux/system_ext_service_contexts", "/system_ext_service_contexts" }, diff --git a/libselinux/src/android/android_internal.h b/libselinux/src/android/android_internal.h index 4960e729..0f11ce8a 100644 --- a/libselinux/src/android/android_internal.h +++ b/libselinux/src/android/android_internal.h @@ -11,8 +11,8 @@ extern "C" { #endif // Context files (file_contexts, service_contexts, etc) may be spread over -// multiple partitions: system, apex, system_ext, product, vendor and/or odm. -#define MAX_CONTEXT_PATHS 6 +// multiple partitions: system, system_ext, product, vendor and/or odm. +#define MAX_CONTEXT_PATHS 5 // The maximum number of alternatives for a file on one partition. #define MAX_ALT_CONTEXT_PATHS 2 typedef struct path_alts { diff --git a/libselinux/src/android/android_seapp.c b/libselinux/src/android/android_seapp.c index 4529e59f..e29c74e9 100644 --- a/libselinux/src/android/android_seapp.c +++ b/libselinux/src/android/android_seapp.c @@ -28,9 +28,6 @@ static const path_alts_t file_context_paths = { .paths = { "/plat_file_contexts" }, { - "/dev/selinux/apex_file_contexts", - }, - { "/system_ext/etc/selinux/system_ext_file_contexts", "/system_ext_file_contexts" }, @@ -62,9 +59,6 @@ static const path_alts_t seapp_context_paths = { .paths = { "/plat_seapp_contexts" }, { - "/dev/selinux/apex_seapp_contexts", - }, - { "/system_ext/etc/selinux/system_ext_seapp_contexts", "/system_ext_seapp_contexts" }, @@ -82,7 +76,6 @@ static const path_alts_t seapp_context_paths = { .paths = { } }, .partitions= { "system", - "system", // regard APEX sepolicy as system "system_ext", "product", "vendor", |