commit 81ad7c8ed43b8167ad64acf4aad693132517d4dd
author Tom Cherry <tomcherry@google.com> Fri Oct 20 01:49:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 20 01:49:32 2017 +0000
tree b3f6368e33f35df9f23495bbaf16a52152d963f4
parent 5e4fefab3c53880f430ba7e5b5c8330af3ae6725
parent ee339fb6157c81c611b57154fd110e47ee867f60

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

Change-Id: I36b8a5ebe5d8845fdc0bba61434b94ef015efea3

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;