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

Commit 4994440f authored by Xin Li's avatar Xin Li
Browse files

Merge commit '2fc42a27' from 

oc-mr1-dev-plus-aosp into stage-aosp-master.

Change-Id: I754fe8c1ec11f047e58694a2fdc8d9ab1b85cab5
parents c8ec93af 2fc42a27

Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -8,8 +8,15 @@ ndk_headers { 


subdirs = [

    "cmds/*",

    "headers",

    "libs/*",

    "opengl",

    "services/*",

    "vulkan",

]



cc_library_headers {

    name: "libandroid_sensor_headers",

    vendor: true,

    export_include_dirs: ["include_sensor"],

}

cmds/atrace/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ cc_binary { 
        "libhidltransport",

        "liblog",

        "libutils",

        "libcutils",

        "libz",

        "libbase",

    ],

cmds/atrace/atrace.cpp

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static const TracingCategory k_categories[] = { 
        { OPT,      "events/sched/sched_waking/enable" },

        { OPT,      "events/sched/sched_blocked_reason/enable" },

        { OPT,      "events/sched/sched_cpu_hotplug/enable" },

        { OPT,      "events/cgroup/enable" },

    } },

    { "irq",        "IRQ Events",   0, {

        { REQ,      "events/irq/enable" },

cmds/atrace/atrace.rc

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ on post-fs 
    chown root shell /sys/kernel/tracing/events/sched/sched_blocked_reason/enable

    chown root shell /sys/kernel/debug/tracing/events/sched/sched_cpu_hotplug/enable

    chown root shell /sys/kernel/tracing/events/sched/sched_cpu_hotplug/enable

    chown root shell /sys/kernel/debug/tracing/events/cgroup/enable

    chown root shell /sys/kernel/tracing/events/cgroup/enable

    chown root shell /sys/kernel/debug/tracing/events/power/cpu_frequency/enable

    chown root shell /sys/kernel/tracing/events/power/cpu_frequency/enable

    chown root shell /sys/kernel/debug/tracing/events/power/cpu_idle/enable
@@ -77,6 +79,8 @@ on post-fs 
    chmod 0664 /sys/kernel/tracing/events/sched/sched_blocked_reason/enable

    chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_cpu_hotplug/enable

    chmod 0664 /sys/kernel/tracing/events/sched/sched_cpu_hotplug/enable

    chmod 0664 /sys/kernel/debug/tracing/events/cgroup/enable

    chmod 0664 /sys/kernel/tracing/events/cgroup/enable

    chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable

    chmod 0664 /sys/kernel/tracing/events/power/cpu_frequency/enable

    chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_idle/enable

cmds/dumpstate/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ cc_library_shared { 
    name: "libdumpstateutil",

    defaults: ["dumpstate_defaults"],

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    header_libs: ["dumpstate_headers"],

    export_header_lib_headers: ["dumpstate_headers"],

    srcs: [