ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: use ro.init.subcontexts_enabled to enable subcontexts"

Browse source 
am: 99016bce92

Change-Id: If410f650dd67577957d653ecd0b1a1e5a45dd14a
This commit is contained in:
Tom Cherry 2017-10-06 20:27:05 +00:00 • committed by android-build-merger
commit 2f5b8bb3f0
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
init/subcontext.cpp
View file

@ -23,6 +23,7 @@
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/properties.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <selinux/android.h> #include <selinux/android.h>
@ -30,6 +31,7 @@
#include "system/core/init/subcontext.pb.h" #include "system/core/init/subcontext.pb.h"
#include "util.h" #include "util.h"
using android::base::GetBoolProperty;
using android::base::GetExecutablePath; using android::base::GetExecutablePath;
using android::base::Join; using android::base::Join;
using android::base::Socketpair; using android::base::Socketpair;
@ -258,12 +260,13 @@ Result<Success> Subcontext::Execute(const std::vector<std::string>& args) {
static std::vector<Subcontext> subcontexts; static std::vector<Subcontext> subcontexts;
std::vector<Subcontext>* InitializeSubcontexts() { std::vector<Subcontext>* InitializeSubcontexts() {
static const char* const paths_and_secontexts[][2] = { if (GetBoolProperty("ro.init.subcontexts_enabled", false)) {
// TODO: Enable this once the SEPolicy is in place. static const char* const paths_and_secontexts[][2] = {
// {"/vendor", kVendorContext.c_str()}, {"/vendor", kVendorContext.c_str()},
}; };
for (const auto& [path_prefix, secontext] : paths_and_secontexts) { for (const auto& [path_prefix, secontext] : paths_and_secontexts) {
subcontexts.emplace_back(path_prefix, secontext); subcontexts.emplace_back(path_prefix, secontext);
}
} }
return &subcontexts; return &subcontexts;
} }