diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-06-12 12:41:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 12:41:25 -0700 |
| commit | 1e96e16f81ce46adf5329b1db4662b53b927d4e2 (patch) | |
| tree | 2cbae47a7ebff235414e48be05064dfd3f689a18 /rootdir/init.rc | |
| parent | 2a2e10fbb38e4f4d7759f619275fa4ebd596259a (diff) | |
| parent | 0f3974c3d0ee2ffe5e0cb9a56658ba18d511f6ea (diff) | |
| download | system_core-1e96e16f81ce46adf5329b1db4662b53b927d4e2.tar.gz system_core-1e96e16f81ce46adf5329b1db4662b53b927d4e2.tar.bz2 system_core-1e96e16f81ce46adf5329b1db4662b53b927d4e2.zip | |
am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev
* commit '0f3974c3d0ee2ffe5e0cb9a56658ba18d511f6ea':
Enable tracing on user builds
Diffstat (limited to 'rootdir/init.rc')
| -rw-r--r-- | rootdir/init.rc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 2305572a..bb7e4eaa 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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 - |