commit b1522619ac38c91b8bb95b8a804d4b9c67d7896f
author Steven Moreland <smoreland@google.com> Wed Jun 08 22:33:37 2022 +0000
committer Steven Moreland <smoreland@google.com> Fri Oct 14 23:19:57 2022 +0000
tree 4e38f9c941c507522ce1e38fb9fccb8aaed43cfa
parent cb23441ce5323bc30c7729d2cc478a99ecfe274c

servicemanager: always use kernel log

previously only used in recovery

Bug: 235390578
Bug: 210919187
Test: boot (logs still only show up when restarting servicemanager)
Change-Id: I89426c7fe27a4c24783e13e3d5d47764e30a3a5b

cmds/servicemanager/main.cpp

diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp
index a831d1b..c1a04dd 100644
--- a/cmds/servicemanager/main.cpp
+++ b/cmds/servicemanager/main.cpp
@@ -111,9 +111,7 @@
 };
 
 int main(int argc, char** argv) {
-#ifdef __ANDROID_RECOVERY__
     android::base::InitLogging(argv, android::base::KernelLogger);
-#endif
 
     if (argc > 2) {
         LOG(FATAL) << "usage: " << argv[0] << " [binder driver]";

cmds/servicemanager/servicemanager.rc

diff --git a/cmds/servicemanager/servicemanager.rc b/cmds/servicemanager/servicemanager.rc
index 6b35265..3bd6db5 100644
--- a/cmds/servicemanager/servicemanager.rc
+++ b/cmds/servicemanager/servicemanager.rc
@@ -3,6 +3,7 @@
     user system
     group system readproc
     critical
+    file /dev/kmsg w
     onrestart setprop servicemanager.ready false
     onrestart restart apexd
     onrestart restart audioserver

cmds/servicemanager/vndservicemanager.rc

diff --git a/cmds/servicemanager/vndservicemanager.rc b/cmds/servicemanager/vndservicemanager.rc
index c9305a1..80af1d1 100644
--- a/cmds/servicemanager/vndservicemanager.rc
+++ b/cmds/servicemanager/vndservicemanager.rc
@@ -2,6 +2,7 @@
     class core
     user system
     group system readproc
+    file /dev/kmsg w
     task_profiles ServiceCapacityLow
     onrestart class_restart main
     onrestart class_restart hal