Merge changes from topic "libprocessgroup_rc" am: 25d42eeaa6

am: 8f3d266984

Change-Id: Iec5b74b1e6a72f5afd1386f902aae7e942d104cd

init/init.cpp

@@ -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

@@ -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

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