commit 8c98938853678e7847a9ed0561d7223e6e764f5c
author Josh Gao <jmgao@google.com> Fri Jan 20 22:27:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 22:27:44 2017 +0000
tree b38d7365462bf9eedd915ec3554db4aa8609cd1d
parent 872e5259739eff933c88605558386af54b1b574b
parent 5d6ea5a9bd496ef51a8324f2f0409104b3b19c06

Merge "init: don't start tombstoned until /data is mounted." am: b479a5002e am: f83489c02c am: d7db8378d0
am: 5d6ea5a9bd

Change-Id: I5ad79b54f9f42e6b04d81ca8123e5b41b03e92fb

debuggerd/tombstoned/tombstoned.rc

diff --git a/debuggerd/tombstoned/tombstoned.rc b/debuggerd/tombstoned/tombstoned.rc
index 3aacf33..eaae9c4 100644
--- a/debuggerd/tombstoned/tombstoned.rc
+++ b/debuggerd/tombstoned/tombstoned.rc
@@ -1,6 +1,4 @@
 service tombstoned /system/bin/tombstoned
-    class core
-
     user tombstoned
     group system
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index bb6bec8..1ae43fb 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -356,14 +356,13 @@
     # We restorecon /data in case the userdata partition has been reset.
     restorecon /data
 
-    # start debuggerd to make debugging early-boot crashes easier.
-    start debuggerd
-    start debuggerd64
-
     # Make sure we have the device encryption key.
     start vold
     installkey /data
 
+    # start tombstoned to record early-boot crashes.
+    start tombstoned
+
     # Start bootcharting as soon as possible after the data partition is
     # mounted to collect more data.
     mkdir /data/bootchart 0755 shell shell