commit 58929b044778a8cb679324d6a8f5ab17c83db06a
author Daniel Cashman <dcashman@google.com> Sat Dec 17 00:59:42 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 17 00:59:43 2016 +0000
tree 1bdfe13015b677b32d870bf04e8ef91078f133e1
parent ebc39117ee344429352fd01eacf5fb0c6cc79a4d
parent a26a98726e2553aae7990ea4813c238d26144044

Merge "Revert "Compile sepolicy on-device at early boot.""

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 4999e58..ecdf5db 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -95,7 +95,6 @@
     libext4_utils_static \
     libbase \
     libc \
-    libsepol \
     libselinux \
     liblog \
     libcrypto_utils \

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 5bf8069..2d474c7 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -36,8 +36,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <cil/android.h>
-#include <cil/cil.h>
 #include <selinux/selinux.h>
 #include <selinux/label.h>
 #include <selinux/android.h>
@@ -519,13 +517,6 @@
     return 0;
 }
 
-/* policy is a combination of platform, non-platform and mapping policy files */
-static constexpr const char* pol_files[]  = {
-    "/plat_sepolicy.cil",
-    "/mapping_sepolicy.cil",
-    "/nonplat_sepolicy.cil"  // TODO, switch to different partition when final.
-};
-
 static void selinux_initialize(bool in_kernel_domain) {
     Timer t;
 
@@ -534,24 +525,13 @@
     selinux_set_callback(SELINUX_CB_LOG, cb);
     cb.func_audit = audit_callback;
     selinux_set_callback(SELINUX_CB_AUDIT, cb);
-    cil_set_log_handler((void (*)(int, char*))selinux_klog_callback);
 
     if (in_kernel_domain) {
-        void* pol_data = NULL;
-        size_t pol_len = 0;
-
-        LOG(INFO) << "Compiling SELinux policy...";
-        if (cil_android_compile_policy(&pol_data, &pol_len, pol_files,
-                arraysize(pol_files)) < 0) {
-            LOG(ERROR) << "failed to compile policy";
-            security_failure();
-        }
         LOG(INFO) << "Loading SELinux policy...";
-        if (selinux_android_load_policy(pol_data, pol_len) < 0) {
+        if (selinux_android_load_policy() < 0) {
             PLOG(ERROR) << "failed to load policy";
             security_failure();
         }
-        free(pol_data);
 
         bool kernel_enforcing = (security_getenforce() == 1);
         bool is_enforcing = selinux_is_enforcing();