diff options
| author | Yifan Hong <elsk@google.com> | 2019-04-03 19:08:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-03 19:08:51 +0000 |
| commit | 25d42eeaa6ace4fc57be6580dfcf45c4785fdb6f (patch) | |
| tree | 65377775c04d2fc184fafdfc7b6cb21146a0f2c2 /init/init.cpp | |
| parent | cd68bda4ec03652d66dc43839a2b3a451d6037fd (diff) | |
| parent | 9d7b89abeacca936aadf94e920caf3987ff1ba48 (diff) | |
Merge changes from topic "libprocessgroup_rc"
* changes:
CgroupSetupCgroups -> CgroupSetup
Add libcgrouprc to ld.config.*.txt.
libprocessgroup: use libcgrouprc to read cgroup.rc
libprocessgroup_setup: use libcgrouprc_format
libprocessgroup: Move CgroupSetupCgroups() to libprocessgroup_setup
libprocessgroup: Add libcgrouprc
libprocessgroup: Add libcgrouprc_format
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/init.cpp b/init/init.cpp index cdec41cd8..0f44efda4 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -45,6 +45,7 @@ #include <libavb/libavb.h> #include <libgsi/libgsi.h> #include <processgroup/processgroup.h> +#include <processgroup/setup.h> #include <selinux/android.h> #ifndef RECOVERY @@ -358,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"; } |