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

Commit 5e1c5149 authored by Zhijun He's avatar Zhijun He Committed by android-build-merger
Browse files

Revert "libprocessgroup users use libcutils" 

am: 5360a849

Change-Id: I3cd5a95311ea42a1dc3ea235790f909e4da6a7e0
parents 0b431170 5360a849

libcutils/Android.bp

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

                "qtaguid.cpp",

            ],

        }

    },

    },



    defaults: [

        "libprocessgroup_impl_provider",

    ],



    shared_libs: [

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

        "libcutils_headers",

        "libutils_headers",

        "libprocessgroup_headers",

    ],

    export_header_lib_headers: [

        "libcutils_headers",

        "libprocessgroup_headers",

    ],

    local_include_dirs: ["include"],

libprocessgroup/Android.bp

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

}



// TODO: remove all usages

cc_library {

    srcs: [

        "cgroup_map.cpp",

        "processgroup.cpp",

        "sched_policy.cpp",

        "task_profiles.cpp",

    ],

    name: "libprocessgroup",

    host_supported: true,

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

        support_system_process: true,

    },

}



cc_defaults {

    name: "libprocessgroup_impl_libs",

    target: {

        linux: {

    shared_libs: [

        "libbase",

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

        "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

    header_libs: [

        "libcutils_headers",

logcat/Android.bp

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

    shared_libs: [

        "libbase",

        "libcutils",

        "libpcrecpp",

        "libprocessgroup",

    ],

    static_libs: ["liblog"],

    logtags: ["event.logtags"],