Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 972a2d30 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF)
Browse files

Revert "libprocessgroup: Remove cgroup.rc file"

Revert submission 3212512

Reason for revert: Droidmonitor created revert due to b/372273614. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3212512

Change-Id: I37568516e973cb940f1229d52f94b8dc801da2ab
parent 691ad736
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ cc_library_static {
        "libsnapshot_cow",
        "liburing",
        "libprocessgroup",
        "libprocessgroup_util",
        "libjsoncpp",
        "libcgrouprc",
        "libcgrouprc_format",
    ],
    include_dirs: ["bionic/libc/kernel"],
    export_include_dirs: ["include"],
@@ -129,9 +129,9 @@ cc_defaults {
        "libsnapshot_cow",
        "libsnapuserd",
        "libprocessgroup",
        "libprocessgroup_util",
        "libjsoncpp",
        "libcgrouprc",
        "libcgrouprc_format",
        "libsnapuserd_client",
        "libz",
        "liblz4",
@@ -221,9 +221,9 @@ cc_defaults {
        "libsnapshot_cow",
        "libsnapuserd",
        "libprocessgroup",
        "libprocessgroup_util",
        "libjsoncpp",
        "libcgrouprc",
        "libcgrouprc_format",
        "liburing",
        "libz",
    ],
@@ -319,6 +319,7 @@ cc_binary_host {
        "libprocessgroup",
        "libjsoncpp",
        "libcgrouprc",
        "libcgrouprc_format",
        "liburing",
        "libz",
    ],
+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ libinit_cc_defaults {
        "libavb",
        "libavf_cc_flags",
        "libbootloader_message",
        "libcgrouprc_format",
        "liblmkd_utils",
        "liblz4",
        "libzstd",
+3 −0
Original line number Diff line number Diff line
@@ -636,6 +636,9 @@ static Result<void> SetupCgroupsAction(const BuiltinArguments&) {
        LOG(INFO) << "Cgroups support in kernel is not enabled";
        return {};
    }
    // 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 (!CgroupSetup()) {
        return ErrnoError() << "Failed to setup cgroups";
    }
+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ cc_defaults {
        android: {
            static_executable: true,
            static_libs: [
                "libprocessgroup_util",
                "libcgrouprc_format",
            ] + test_libraries + always_static_test_libraries,
        },
        not_windows: {
+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ soong_config_module_type {

libprocessgroup_flag_aware_cc_defaults {
    name: "libprocessgroup_build_flags_cc",
    cpp_std: "gnu++23",
    cpp_std: "gnu++20",
    soong_config_variables: {
        memcg_v2_force_enabled: {
            cflags: [
@@ -116,6 +116,5 @@ cc_test {
    ],
    static_libs: [
        "libgmock",
        "libprocessgroup_util",
    ],
}
Loading