commit 9d7b89abeacca936aadf94e920caf3987ff1ba48
author Yifan Hong <elsk@google.com> Tue Apr 02 15:10:40 2019 -0700
committer Yifan Hong <elsk@google.com> Tue Apr 02 22:31:57 2019 -0700
tree 56b7819bb8d7cda800f263b4fba29c2d731d8d83
parent 063b6beef05ae3bed6d6ca2e4b13c642503ff2b4

CgroupSetupCgroups -> CgroupSetup

Test: builds
Bug: 123664216
Change-Id: I47c46ca9ba5c1fbf3f9f7a1b185dc48b058b1e32
Merged-In: I47c46ca9ba5c1fbf3f9f7a1b185dc48b058b1e32

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 1792f28..0f44efd 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -359,7 +359,7 @@
     // 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

diff --git a/libprocessgroup/setup/cgroup_map_write.cpp b/libprocessgroup/setup/cgroup_map_write.cpp
index 6aabd56..26703ee 100644
--- a/libprocessgroup/setup/cgroup_map_write.cpp
+++ b/libprocessgroup/setup/cgroup_map_write.cpp
@@ -277,7 +277,7 @@
 }  // namespace cgrouprc
 }  // namespace android
 
-bool CgroupSetupCgroups() {
+bool CgroupSetup() {
     using namespace android::cgrouprc;
 
     std::map<std::string, CgroupDescriptor> descriptors;

libprocessgroup/setup/include/processgroup/setup.h

diff --git a/libprocessgroup/setup/include/processgroup/setup.h b/libprocessgroup/setup/include/processgroup/setup.h
index b488217..6ea1979 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();