commit ee339fb6157c81c611b57154fd110e47ee867f60
author Tom Cherry <tomcherry@google.com> Fri Oct 20 00:57:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 20 00:57:13 2017 +0000
tree 9e31cfacce65a6b7408a76debb1deb28d82777f1
parent 1d77a0bf037faa466014a69a0219a22dc268389e
parent 3f5be6c82652be818b4ac13adf4e9f330effa622

Merge "init: add SelabelInitialize() for subcontext" am: cba7f57119
am: f0b4e4daee

Change-Id: Ie47b9238ae05cdad1f7a8569ff1e8ca6dabe588d

init/subcontext.cpp

diff --git a/init/subcontext.cpp b/init/subcontext.cpp
index 927953d..84feeee 100644
--- a/init/subcontext.cpp
+++ b/init/subcontext.cpp
@@ -28,6 +28,7 @@
 #include <selinux/android.h>
 
 #include "action.h"
+#include "selinux.h"
 #include "system/core/init/subcontext.pb.h"
 #include "util.h"
 
@@ -165,6 +166,7 @@
     auto context = std::string(argv[2]);
     auto init_fd = std::atoi(argv[3]);
 
+    SelabelInitialize();
     auto subcontext_process = SubcontextProcess(function_map, context, init_fd);
     subcontext_process.MainLoop();
     return 0;