commit 7c369a58a5320a1db2d22744ef3c18dbac2ef289
author Tri Vo <trong@google.com> Tue Dec 18 13:44:49 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 18 13:44:49 2018 -0800
tree 3020c9a6e5f4ddd5ce27f2afecbef949841b8ca9
parent 730a4103991ddff83a0b4216699f81244a3bc734
parent 696324adc8130b495393d8cda37715c7d4f8ce78

Merge "init: support loading /product/etc/selinux/product_sepolicy.cil" am: 96b8ce7228 am: 4c558686c1
am: d5eedf96f0

Change-Id: I4a437b16ae39d8f1cda8608ad094539c36ec4e35

init/selinux.cpp

diff --git a/init/selinux.cpp b/init/selinux.cpp
index 3a09096..04ca207 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -306,6 +306,11 @@
     }
     std::string mapping_file("/system/etc/selinux/mapping/" + vend_plat_vers + ".cil");
 
+    std::string product_policy_cil_file("/product/etc/selinux/product_sepolicy.cil");
+    if (access(product_policy_cil_file.c_str(), F_OK) == -1) {
+        product_policy_cil_file.clear();
+    }
+
     // vendor_sepolicy.cil and plat_pub_versioned.cil are the new design to replace
     // nonplat_sepolicy.cil.
     std::string plat_pub_versioned_cil_file("/vendor/etc/selinux/plat_pub_versioned.cil");
@@ -342,6 +347,9 @@
     };
     // clang-format on
 
+    if (!product_policy_cil_file.empty()) {
+        compile_args.push_back(product_policy_cil_file.c_str());
+    }
     if (!plat_pub_versioned_cil_file.empty()) {
         compile_args.push_back(plat_pub_versioned_cil_file.c_str());
     }