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

Commit 5360a849 authored by Zhijun He's avatar Zhijun He Committed by Raylin Hsu
Browse files

Revert "libprocessgroup users use libcutils" 

This reverts commit 1ec3b78b.

Reason for revert: breaks all camera use cases

Bug: 135568875

Exempt-From-Owner-Approval: revert, no build cop

Change-Id: Iec8e1f94f5bedced3f3faf73f851fd2f13e2e768
parent c99582dc

libcutils/Android.bp

+3 −5
Original line number Original line Diff line number Diff line
@@ -169,12 +169,8 @@ cc_library { 
                // releases, exclude qtaguid.cpp from the VNDK-SP variant.

                // releases, exclude qtaguid.cpp from the VNDK-SP variant.

                "qtaguid.cpp",

                "qtaguid.cpp",

            ],

            ],

        }

    },

    },

    },



    defaults: [

        "libprocessgroup_impl_provider",

    ],





    shared_libs: [

    shared_libs: [

        "liblog",

        "liblog",
@@ -184,9 +180,11 @@ cc_library { 
        "libbase_headers",

        "libbase_headers",

        "libcutils_headers",

        "libcutils_headers",

        "libutils_headers",

        "libutils_headers",

        "libprocessgroup_headers",

    ],

    ],

    export_header_lib_headers: [

    export_header_lib_headers: [

        "libcutils_headers",

        "libcutils_headers",

        "libprocessgroup_headers",

    ],

    ],

    local_include_dirs: ["include"],

    local_include_dirs: ["include"],

libprocessgroup/Android.bp

+12 −41
Original line number Original line Diff line number Diff line
@@ -14,8 +14,13 @@ cc_library_headers { 
    },

    },

}

}





// TODO: remove all usages

cc_library {

cc_library {

    srcs: [

        "cgroup_map.cpp",

        "processgroup.cpp",

        "sched_policy.cpp",

        "task_profiles.cpp",

    ],

    name: "libprocessgroup",

    name: "libprocessgroup",

    host_supported: true,

    host_supported: true,

    recovery_available: true,

    recovery_available: true,
@@ -24,12 +29,6 @@ cc_library { 
        enabled: true,

        enabled: true,

        support_system_process: true,

        support_system_process: true,

    },

    },

}



cc_defaults {

    name: "libprocessgroup_impl_libs",

    target: {

        linux: {

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",

        "libcgrouprc",

        "libcgrouprc",
@@ -37,34 +36,6 @@ cc_defaults { 
    static_libs: [

    static_libs: [

        "libjsoncpp",

        "libjsoncpp",

    ],

    ],

        },

    },

}



cc_defaults {

    name: "libprocessgroup_impl_provider",

    defaults: ["libprocessgroup_impl_libs"],

    target: {

        linux: {

            whole_static_libs: [

                "libprocessgroup_impl",

            ],

        },

    },

}



cc_library {

    name: "libprocessgroup_impl",

    defaults: ["libprocessgroup_impl_libs"],

    srcs: [

        "cgroup_map.cpp",

        "processgroup.cpp",

        "sched_policy.cpp",

        "task_profiles.cpp",

    ],

    host_supported: true,

    recovery_available: true,

    vendor_available: true,

    // for cutils/android_filesystem_config.h

    // for cutils/android_filesystem_config.h

    header_libs: [

    header_libs: [

        "libcutils_headers",

        "libcutils_headers",

logcat/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,8 +24,8 @@ cc_defaults { 
    ],

    ],

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",

        "libcutils",

        "libpcrecpp",

        "libpcrecpp",

        "libprocessgroup",

    ],

    ],

    static_libs: ["liblog"],

    static_libs: ["liblog"],

    logtags: ["event.logtags"],

    logtags: ["event.logtags"],