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

Commit 1e96e16f authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev 

* commit '0f3974c3':
  Enable tracing on user builds
parents 2a2e10fb 0f3974c3

rootdir/init.rc

+1 −5
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


import /init.${ro.hardware}.rc

import /init.usb.rc

import /init.trace.rc



on early-init

    # Set init and its forked children's oom_adj.
@@ -353,10 +354,6 @@ service console /system/bin/sh 
on property:ro.debuggable=1

    start console



# Allow writing to the kernel trace log.  Enabling tracing still requires root.

on property:ro.debuggable=1

    chmod 0222 /sys/kernel/debug/tracing/trace_marker



# adbd is controlled via property triggers in init.<platform>.usb.rc

service adbd /sbin/adbd

    class core
@@ -491,4 +488,3 @@ service mdnsd /system/bin/mdnsd 
    socket mdnsd stream 0660 mdnsr inet

    disabled

    oneshot

rootdir/init.trace.rc

0 → 100644
+31 −0
Original line number Diff line number Diff line 
## Permissions to allow system-wide tracing to the kernel trace buffer.

##

on boot



# Allow writing to the kernel trace log.

    chmod 0222 /sys/kernel/debug/tracing/trace_marker



# Allow the shell group to enable (some) kernel tracing.

    chown root shell /sys/kernel/debug/tracing/trace_clock

    chown root shell /sys/kernel/debug/tracing/buffer_size_kb

    chown root shell /sys/kernel/debug/tracing/options/overwrite

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

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

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

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

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

    chown root shell /sys/kernel/debug/tracing/tracing_on



    chmod 0664 /sys/kernel/debug/tracing/trace_clock

    chmod 0664 /sys/kernel/debug/tracing/buffer_size_kb

    chmod 0664 /sys/kernel/debug/tracing/options/overwrite

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

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

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

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

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

    chmod 0664 /sys/kernel/debug/tracing/tracing_on



# Allow only the shell group to read and truncate the kernel trace.

    chown root shell /sys/kernel/debug/tracing/trace

    chmod 0660 /sys/kernel/debug/tracing/trace