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

Merge "Remove references to nonplat sepolicy" am: f1c36760be

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1882069

Change-Id: I06a7bd921d11d7ae007bfe53760105100d56810c
This commit is contained in:
Treehugger Robot 2021-11-05 15:54:03 +00:00 committed by Automerger Merge Worker
commit 2de1071db7
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libc/system_properties/contexts_split.cpp
View file

@ -274,9 +274,6 @@ bool ContextsSplit::InitializeProperties() {
// still need the system / platform properties to function. // still need the system / platform properties to function.
if (access("/vendor/etc/selinux/vendor_property_contexts", R_OK) != -1) { if (access("/vendor/etc/selinux/vendor_property_contexts", R_OK) != -1) {
InitializePropertiesFromFile("/vendor/etc/selinux/vendor_property_contexts"); InitializePropertiesFromFile("/vendor/etc/selinux/vendor_property_contexts");
} else {
// Fallback to nonplat_* if vendor_* doesn't exist.
InitializePropertiesFromFile("/vendor/etc/selinux/nonplat_property_contexts");
} }
} else { } else {
if (!InitializePropertiesFromFile("/plat_property_contexts")) { if (!InitializePropertiesFromFile("/plat_property_contexts")) {
@ -284,9 +281,6 @@ bool ContextsSplit::InitializeProperties() {
} }
if (access("/vendor_property_contexts", R_OK) != -1) { if (access("/vendor_property_contexts", R_OK) != -1) {
InitializePropertiesFromFile("/vendor_property_contexts"); InitializePropertiesFromFile("/vendor_property_contexts");
} else {
// Fallback to nonplat_* if vendor_* doesn't exist.
InitializePropertiesFromFile("/nonplat_property_contexts");
} }
} }