commit 4611f8804713aaf06e3c9002023fb6c9e5a3f853
author Tom Cherry <tomcherry@google.com> Tue Feb 19 13:55:40 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 19 13:55:40 2019 -0800
tree 7701aef6ee1588a9ac25c50a4f8e99f758d2eefb
parent f2205722807f8f7dd8bc566f9d80f57c3166e90c
parent 33ccbc8db7167f537d7556e474e8fef45b203a03

Merge "load selinux property_contexts in /odm and /product"
am: 7e6dc56b85

Change-Id: I336c4850a1d89de0828ef6dccbc5d902243e2726

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();