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

Commit 29855246 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5671249 from 0b431170 to qt-qpr1-release 

Change-Id: Id770a7cc8c21e6ef7b6780fc159dd2c627f8e3fb
parents debfb2ca 0b431170

libcutils/Android.bp

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

                "qtaguid.cpp",

            ],

        }

        },

    },



    defaults: [

        "libprocessgroup_impl_provider",

    ],



    shared_libs: [

        "liblog",
@@ -180,11 +184,9 @@ 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

+41 −12
Original line number Diff line number Diff line
@@ -14,13 +14,8 @@ 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,
@@ -29,6 +24,12 @@ cc_library { 
        enabled: true,

        support_system_process: true,

    },

}



cc_defaults {

    name: "libprocessgroup_impl_libs",

    target: {

        linux: {

            shared_libs: [

                "libbase",

                "libcgrouprc",
@@ -36,6 +37,34 @@ cc_library { 
            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"],

rootdir/init.rc

+4 −1
Original line number Diff line number Diff line
@@ -345,8 +345,11 @@ on late-init 
    trigger early-boot

    trigger boot



on post-fs

on early-fs

    # Once metadata has been mounted, we'll need vold to deal with userdata checkpointing

    start vold



on post-fs

    exec - system system -- /system/bin/vdc checkpoint markBootAttempt



    # Once everything is setup, no need to modify /.