commit 33ccbc8db7167f537d7556e474e8fef45b203a03
author Tom Cherry <tomcherry@google.com> Tue Feb 19 21:34:35 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 19 21:34:35 2019 +0000
tree 7701aef6ee1588a9ac25c50a4f8e99f758d2eefb
parent 5b1a1d80c6938eec0f6da7cf48b1614507270ba8
parent 3069e9fa0bfc5a643e3f9548f77a78077f35f7c4

Merge "load selinux property_contexts in /odm and /product"

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 46e5e12..76638b8 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -908,6 +908,13 @@
             LoadPropertyInfoFromFile("/vendor/etc/selinux/nonplat_property_contexts",
                                      &property_infos);
         }
+        if (access("/product/etc/selinux/product_property_contexts", R_OK) != -1) {
+            LoadPropertyInfoFromFile("/product/etc/selinux/product_property_contexts",
+                                     &property_infos);
+        }
+        if (access("/odm/etc/selinux/odm_property_contexts", R_OK) != -1) {
+            LoadPropertyInfoFromFile("/odm/etc/selinux/odm_property_contexts", &property_infos);
+        }
     } else {
         if (!LoadPropertyInfoFromFile("/plat_property_contexts", &property_infos)) {
             return;
@@ -916,6 +923,8 @@
             // Fallback to nonplat_* if vendor_* doesn't exist.
             LoadPropertyInfoFromFile("/nonplat_property_contexts", &property_infos);
         }
+        LoadPropertyInfoFromFile("/product_property_contexts", &property_infos);
+        LoadPropertyInfoFromFile("/odm_property_contexts", &property_infos);
     }
 
     auto serialized_contexts = std::string();