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

am: 9815d0d400

Change-Id: I36b8a5ebe5d8845fdc0bba61434b94ef015efea3
This commit is contained in:
Tom Cherry 2017-10-20 01:49:32 +00:00 committed by android-build-merger
commit c4763ff50b

View file

@ -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 @@ int SubcontextMain(int argc, char** argv, const KeywordFunctionMap* function_map
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;