commit f0b4e4daee1abc3f6b0f37389637d550c709fdbe
author Tom Cherry <tomcherry@google.com> Fri Oct 20 00:54:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 20 00:54:39 2017 +0000
tree a3dc3f7d991721b4ee46174c778e75cb996223c6
parent 450613ce717331e845e68648102e2407bd90275a
parent cba7f57119ab0f20f5c6a419d2a677b45a8deb8b

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

Change-Id: I0ea0c99c5848aeaa5fd463e347bd76c5b471b7ef

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;