commit c377843258d08d31a2eb7df1a577740e588d2761
author Mark Salyzyn <salyzyn@google.com> Thu Oct 27 08:13:42 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Nov 03 13:34:27 2016 -0700
tree 6db18ce43e0aa872c2202ae5c081d301050f9a79
parent 77fdb22cf686002dfba8a24cf36666d7257b3034

libcutils: klog inherit android_get_control_file("/dev/kmsg")

If the file descriptor is in the environment, use it.

Test: compile
Bug: 32450474
Change-Id: Id208b11b727a44dc861a141130a644d7d8009c5f

libcutils/klog.cpp

diff --git a/libcutils/klog.cpp b/libcutils/klog.cpp
index 061af1b..9d823cf 100644
--- a/libcutils/klog.cpp
+++ b/libcutils/klog.cpp
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <cutils/files.h>
 #include <cutils/klog.h>
 
 static int klog_level = KLOG_DEFAULT_LEVEL;
@@ -37,7 +38,11 @@
 }
 
 static int __open_klog(void) {
-    return TEMP_FAILURE_RETRY(open("/dev/kmsg", O_WRONLY | O_CLOEXEC));
+    static const char kmsg_device[] = "/dev/kmsg";
+
+    int ret = android_get_control_file(kmsg_device);
+    if (ret >= 0) return ret;
+    return TEMP_FAILURE_RETRY(open(kmsg_device, O_WRONLY | O_CLOEXEC));
 }
 
 #define LOG_BUF_MAX 512