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

Merge changes from topic "libprocessgroup_rc" am: 25d42eeaa6

Browse source 
am: 8f3d266984

Change-Id: Iec5b74b1e6a72f5afd1386f902aae7e942d104cd
This commit is contained in:
Yifan Hong 2019-04-03 12:54:53 -07:00 • committed by android-build-merger
commit 10f7835736
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/init.cpp
View file

@ -359,7 +359,7 @@ static Result<Success> SetupCgroupsAction(const BuiltinArguments&) {
// Have to create <CGROUPS_RC_DIR> using make_dir function // Have to create <CGROUPS_RC_DIR> using make_dir function
// for appropriate sepolicy to be set for it // for appropriate sepolicy to be set for it
make_dir(android::base::Dirname(CGROUPS_RC_PATH), 0711); make_dir(android::base::Dirname(CGROUPS_RC_PATH), 0711);
if (!CgroupSetupCgroups()) { if (!CgroupSetup()) {
return ErrnoError() << "Failed to setup cgroups"; return ErrnoError() << "Failed to setup cgroups";
} }

2
libprocessgroup/setup/cgroup_map_write.cpp
View file

@ -277,7 +277,7 @@ CgroupDescriptor::CgroupDescriptor(uint32_t version, const std::string& name,
} // namespace cgrouprc } // namespace cgrouprc
} // namespace android } // namespace android
bool CgroupSetupCgroups() { bool CgroupSetup() {
using namespace android::cgrouprc; using namespace android::cgrouprc;
std::map<std::string, CgroupDescriptor> descriptors; std::map<std::string, CgroupDescriptor> descriptors;

2
libprocessgroup/setup/include/processgroup/setup.h
View file

@ -16,4 +16,4 @@
#pragma once #pragma once
bool CgroupSetupCgroups(); bool CgroupSetup();