From 9d7b89abeacca936aadf94e920caf3987ff1ba48 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Tue, 2 Apr 2019 15:10:40 -0700
Subject: [PATCH] CgroupSetupCgroups -> CgroupSetup

Test: builds
Bug: 123664216
Change-Id: I47c46ca9ba5c1fbf3f9f7a1b185dc48b058b1e32
Merged-In: I47c46ca9ba5c1fbf3f9f7a1b185dc48b058b1e32
---
 init/init.cpp                                      | 2 +-
 libprocessgroup/setup/cgroup_map_write.cpp         | 2 +-
 libprocessgroup/setup/include/processgroup/setup.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init/init.cpp b/init/init.cpp
index 1792f288e..0f44efda4 100644
--- a/init/init.cpp
+++ b/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";
     }
 
diff --git a/libprocessgroup/setup/cgroup_map_write.cpp b/libprocessgroup/setup/cgroup_map_write.cpp
index 6aabd56bd..26703eea7 100644
--- a/libprocessgroup/setup/cgroup_map_write.cpp
+++ b/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;
diff --git a/libprocessgroup/setup/include/processgroup/setup.h b/libprocessgroup/setup/include/processgroup/setup.h
index b488217d0..6ea19793e 100644
--- a/libprocessgroup/setup/include/processgroup/setup.h
+++ b/libprocessgroup/setup/include/processgroup/setup.h
@@ -16,4 +16,4 @@
 
 #pragma once
 
-bool CgroupSetupCgroups();
+bool CgroupSetup();