commit 98c6c3304acc1593467e3706f2da6b6d7871b397
author Tom Cherry <tomcherry@google.com> Wed Oct 30 13:51:03 2019 -0700
committer Tom Cherry <tomcherry@google.com> Thu Oct 31 06:43:47 2019 -0700
tree 6e4c53713e08ca164decd1296d8b7c7be8fee552
parent 2ff3c44304545b80efc3d65a02c54fea6a8c2eda

logcat: fix logcatd / logpersist

Removing the rest of liblogcat broke logcatd since LogcatPanic() now
actually calls exit(), whereas logcatd relied on it to return
normally.

We can achieve the expected behavior with a small shell script, so
this change does that as well.

Test: logcatd / logpersist work
Change-Id: Icde36a4811a0db987a801978485e1af1dfc3d38c

logcat/Android.bp

diff --git a/logcat/Android.bp b/logcat/Android.bp
index e472d08..61fba59 100644
--- a/logcat/Android.bp
+++ b/logcat/Android.bp
@@ -36,19 +36,13 @@
 
     defaults: ["logcat_defaults"],
     srcs: [
-        "logcat_main.cpp",
         "logcat.cpp",
     ],
 }
 
-cc_binary {
+sh_binary {
     name: "logcatd",
-
-    defaults: ["logcat_defaults"],
-    srcs: [
-        "logcatd_main.cpp",
-        "logcat.cpp",
-    ],
+    src: "logcatd",
 }
 
 sh_binary {