Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10f78357 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge changes from topic "libprocessgroup_rc" am: 25d42eea 

am: 8f3d2669

Change-Id: Iec5b74b1e6a72f5afd1386f902aae7e942d104cd
parents 794f523b 8f3d2669

init/init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static Result<Success> SetupCgroupsAction(const BuiltinArguments&) { 
    // Have to create <CGROUPS_RC_DIR> using make_dir function

    // for appropriate sepolicy to be set for it

    make_dir(android::base::Dirname(CGROUPS_RC_PATH), 0711);

    if (!CgroupSetupCgroups()) {

    if (!CgroupSetup()) {

        return ErrnoError() << "Failed to setup cgroups";

    }

libprocessgroup/setup/cgroup_map_write.cpp

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ CgroupDescriptor::CgroupDescriptor(uint32_t version, const std::string& name, 
}  // namespace cgrouprc

}  // namespace android



bool CgroupSetupCgroups() {

bool CgroupSetup() {

    using namespace android::cgrouprc;



    std::map<std::string, CgroupDescriptor> descriptors;

libprocessgroup/setup/include/processgroup/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


#pragma once



bool CgroupSetupCgroups();
 
bool CgroupSetup();