commit | 10f7835736ad7527f4ff7aba63aa045d80aa2b19 | [log] [tgz] |
---|---|---|
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 | 794f523b80eeb1c015bdf607c00060c7b9983ff8 [diff] | |
parent | 8f3d26698471483fb68bb174bc8205e9ec94027b [diff] |
Merge changes from topic "libprocessgroup_rc" am: 25d42eeaa6 am: 8f3d266984 Change-Id: Iec5b74b1e6a72f5afd1386f902aae7e942d104cd
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"; }
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;
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();