diff options
author | Jamie Gennis | 2012-06-12 15:05:49 -0500 |
---|---|---|
committer | Android Git Automerger | 2012-06-12 15:05:49 -0500 |
commit | c06be8a15d8d89bcc8ac505b25b5e828e90a5be6 (patch) | |
tree | 65d210c1b8bfbbe8c3534a14f44f36f9d3953b5c /rootdir/init.rc | |
parent | 60f3d65c831a40897a942513147039eef20d2149 (diff) | |
parent | 1e96e16f81ce46adf5329b1db4662b53b927d4e2 (diff) | |
download | platform-system-core-c06be8a15d8d89bcc8ac505b25b5e828e90a5be6.tar.gz platform-system-core-c06be8a15d8d89bcc8ac505b25b5e828e90a5be6.tar.xz platform-system-core-c06be8a15d8d89bcc8ac505b25b5e828e90a5be6.zip |
am 1e96e16f: am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev
* commit '1e96e16f81ce46adf5329b1db4662b53b927d4e2':
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 7fb50a303..24200d05f 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc | |||
@@ -6,6 +6,7 @@ | |||
6 | 6 | ||
7 | import /init.${ro.hardware}.rc | 7 | import /init.${ro.hardware}.rc |
8 | import /init.usb.rc | 8 | import /init.usb.rc |
9 | import /init.trace.rc | ||
9 | 10 | ||
10 | on early-init | 11 | on early-init |
11 | # Set init and its forked children's oom_adj. | 12 | # Set init and its forked children's oom_adj. |
@@ -354,10 +355,6 @@ service console /system/bin/sh | |||
354 | on property:ro.debuggable=1 | 355 | on property:ro.debuggable=1 |
355 | start console | 356 | start console |
356 | 357 | ||
357 | # Allow writing to the kernel trace log. Enabling tracing still requires root. | ||
358 | on property:ro.debuggable=1 | ||
359 | chmod 0222 /sys/kernel/debug/tracing/trace_marker | ||
360 | |||
361 | # adbd is controlled via property triggers in init.<platform>.usb.rc | 358 | # adbd is controlled via property triggers in init.<platform>.usb.rc |
362 | service adbd /sbin/adbd | 359 | service adbd /sbin/adbd |
363 | class core | 360 | class core |
@@ -492,4 +489,3 @@ service mdnsd /system/bin/mdnsd | |||
492 | socket mdnsd stream 0660 mdnsr inet | 489 | socket mdnsd stream 0660 mdnsr inet |
493 | disabled | 490 | disabled |
494 | oneshot | 491 | oneshot |
495 | |||