commit a0ffabf0a80b83221d1d9c229da1eac816e9d7c0
author Alex Klyubin <klyubin@google.com> Fri Mar 03 21:43:23 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 03 21:43:24 2017 +0000
tree ffdc1474f10660559534d8740a52e3f24a7e135d
parent 88b4b5e244615dcc984b072dd545f5844f5a2932
parent 45a462a11b92e959e7034c6a42265978f8273ad2

Merge "Track the move of split SELinux policy CIL files"

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 53e7482..28e6008 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -669,7 +669,7 @@
     }
 }
 
-static constexpr const char plat_policy_cil_file[] = "/plat_sepolicy.cil";
+static constexpr const char plat_policy_cil_file[] = "/system/etc/selinux/plat_sepolicy.cil";
 
 static bool selinux_is_split_policy_device() { return access(plat_policy_cil_file, R_OK) != -1; }
 
@@ -701,7 +701,8 @@
 
     const char* compile_args[] = {"/system/bin/secilc", plat_policy_cil_file, "-M", "true", "-c",
                                   "30",  // TODO: pass in SELinux policy version from build system
-                                  "/mapping_sepolicy.cil", "/nonplat_sepolicy.cil", "-o",
+                                  "/vendor/etc/selinux/mapping_sepolicy.cil",
+                                  "/vendor/etc/selinux/nonplat_sepolicy.cil", "-o",
                                   compiled_sepolicy,
                                   // We don't care about file_contexts output by the compiler
                                   "-f", "/sys/fs/selinux/null",  // /dev/null is not yet available