commit 0cb854013295171e76b8c99fd2b1fc42963df75c
author Yifan Hong <elsk@google.com> Wed Apr 03 12:54:53 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 12:54:53 2019 -0700
tree bcafab9c50418c5d2d53e9444acb83c61980314d
parent 9af721e47e1371ca8aa8e695f325998424a09c2e
parent 4cf576f92ccc834dca80a1f08e904fb275a09fb6

Merge changes from topic "libprocessgroup_rc" am: 25d42eeaa6
am: 8f3d266984

Change-Id: Iec5b74b1e6a72f5afd1386f902aae7e942d104cd

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();