diff --git a/init/Android.mk b/init/Android.mk index c9bf9fce2..f2c08429b 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -74,7 +74,7 @@ LOCAL_SRC_FILES:= \ service.cpp \ util.cpp \ -LOCAL_STATIC_LIBRARIES := libbase libselinux liblog libprocessgroup libnl +LOCAL_STATIC_LIBRARIES := libbase libselinux liblog libprocessgroup LOCAL_WHOLE_STATIC_LIBRARIES := libcap LOCAL_MODULE := libinit LOCAL_SANITIZE := integer @@ -124,7 +124,6 @@ LOCAL_STATIC_LIBRARIES := \ libsparse \ libz \ libprocessgroup \ - libnl \ libavb # Create symlinks. diff --git a/init/log.cpp b/init/log.cpp index ee6489b9a..06157306b 100644 --- a/init/log.cpp +++ b/init/log.cpp @@ -21,7 +21,6 @@ #include #include -#include #include void InitKernelLogging(char* argv[]) { @@ -41,24 +40,6 @@ void InitKernelLogging(char* argv[]) { android::base::InitLogging(argv, &android::base::KernelLogger); } -static void selinux_avc_log(char* buf, size_t buf_len) { - size_t str_len = strnlen(buf, buf_len); - - // trim newline at end of string - buf[str_len - 1] = '\0'; - - struct nl_sock* sk = nl_socket_alloc(); - if (sk == NULL) { - return; - } - nl_connect(sk, NETLINK_AUDIT); - int result; - do { - result = nl_send_simple(sk, AUDIT_USER_AVC, 0, buf, str_len); - } while (result == -NLE_INTR); - nl_socket_free(sk); -} - int selinux_klog_callback(int type, const char *fmt, ...) { android::base::LogSeverity severity = android::base::ERROR; if (type == SELINUX_WARNING) { @@ -69,15 +50,8 @@ int selinux_klog_callback(int type, const char *fmt, ...) { char buf[1024]; va_list ap; va_start(ap, fmt); - int res = vsnprintf(buf, sizeof(buf), fmt, ap); + vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - if (res <= 0) { - return 0; - } - if (type == SELINUX_AVC) { - selinux_avc_log(buf, sizeof(buf)); - } else { - android::base::KernelLogger(android::base::MAIN, severity, "selinux", nullptr, 0, buf); - } + android::base::KernelLogger(android::base::MAIN, severity, "selinux", nullptr, 0, buf); return 0; }