commit 1624d9448c2100112b926f22e30e338d4d657a4b
author Jeffrey Vander Stoep <jeffv@google.com> Mon May 06 15:55:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 06 15:55:21 2019 -0700
tree ff52aef9b2398f97b04c340bb40116490e0707df
parent c0bef961e41856ae4645fde32c5a2fb91f44d871
parent d0aac16ee8d9140e673f81b5563a70d311dab512

Merge "Load selinux compat file if it exists" am: 0cd8102bbd
am: a2a0781df1

Change-Id: I1927fa37cb81128f712c97254ea54a74b854935c

init/selinux.cpp

diff --git a/init/selinux.cpp b/init/selinux.cpp
index 132fc13..c49dc9f 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -331,6 +331,12 @@
     }
     std::string plat_mapping_file("/system/etc/selinux/mapping/" + vend_plat_vers + ".cil");
 
+    std::string plat_compat_cil_file("/system/etc/selinux/mapping/" + vend_plat_vers +
+                                     ".compat.cil");
+    if (access(plat_compat_cil_file.c_str(), F_OK) == -1) {
+        plat_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();
@@ -376,6 +382,9 @@
     };
     // clang-format on
 
+    if (!plat_compat_cil_file.empty()) {
+        compile_args.push_back(plat_compat_cil_file.c_str());
+    }
     if (!product_policy_cil_file.empty()) {
         compile_args.push_back(product_policy_cil_file.c_str());
     }