commit 832c06c27cb89f6475b82a613cdef17a1c30526f
author Yo Chiang <yochiang@google.com> Tue Apr 13 07:13:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 13 07:13:22 2021 +0000
tree 57d12458f8ad04bcd8d0db35622e9a03bc8da1f6
parent 0b98decb24f44390f87a872c9edafc5fa106110c
parent 6e944a94840d2120be341dd84b1b450bf5b61c75

Merge "Load *_compat_cil_file from system_ext as well" am: 3841fdfa3c am: 6e944a9484

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1650271

Change-Id: Ibe73d8e2862ce8bd75db09bef1a9bb0d9073ec24

init/selinux.cpp

diff --git a/init/selinux.cpp b/init/selinux.cpp
index 2d3e06e..35a96f9 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -372,6 +372,12 @@
         system_ext_mapping_file.clear();
     }
 
+    std::string system_ext_compat_cil_file("/system_ext/etc/selinux/mapping/" + vend_plat_vers +
+                                           ".compat.cil");
+    if (access(system_ext_compat_cil_file.c_str(), F_OK) == -1) {
+        system_ext_compat_cil_file.clear();
+    }
+
     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();
@@ -426,6 +432,9 @@
     if (!system_ext_mapping_file.empty()) {
         compile_args.push_back(system_ext_mapping_file.c_str());
     }
+    if (!system_ext_compat_cil_file.empty()) {
+        compile_args.push_back(system_ext_compat_cil_file.c_str());
+    }
     if (!product_policy_cil_file.empty()) {
         compile_args.push_back(product_policy_cil_file.c_str());
     }