commit 5205e8ac5e4f1534bce09f6bb8a396a7520fe11a
author Elliott Hughes <enh@google.com> Fri Nov 05 21:16:12 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 05 21:16:12 2021 +0000
tree 84209445d29bc975ef9bf8858f60c9a613e3dcad
parent f1c36760be5d964669fcd9e7e5bd7e75d3ce9e63
parent b6b7e2ee2e6db849dc8509ce1c97e66dbb143635

Merge "Add the missing '--' to shell invocations."

libc/system_properties/contexts_split.cpp

diff --git a/libc/system_properties/contexts_split.cpp b/libc/system_properties/contexts_split.cpp
index f71d70a..7ba835a 100644
--- a/libc/system_properties/contexts_split.cpp
+++ b/libc/system_properties/contexts_split.cpp
@@ -274,9 +274,6 @@
     // still need the system / platform properties to function.
     if (access("/vendor/etc/selinux/vendor_property_contexts", R_OK) != -1) {
       InitializePropertiesFromFile("/vendor/etc/selinux/vendor_property_contexts");
-    } else {
-      // Fallback to nonplat_* if vendor_* doesn't exist.
-      InitializePropertiesFromFile("/vendor/etc/selinux/nonplat_property_contexts");
     }
   } else {
     if (!InitializePropertiesFromFile("/plat_property_contexts")) {
@@ -284,9 +281,6 @@
     }
     if (access("/vendor_property_contexts", R_OK) != -1) {
       InitializePropertiesFromFile("/vendor_property_contexts");
-    } else {
-      // Fallback to nonplat_* if vendor_* doesn't exist.
-      InitializePropertiesFromFile("/nonplat_property_contexts");
     }
   }