From a7c1ff6906bcec9815a40154432666176b2134ac Mon Sep 17 00:00:00 2001
From: Tej Singh <singhtejinder@google.com>
Date: Tue, 19 Mar 2019 22:03:34 -0700
Subject: [PATCH] stats_event_list changes for statsd mainline api

Cherry pick to aosp.
stats_event_list changes for creating a generic api for statsd mainline
logging.

Test: builds
Test: existing logs continue to flow
Change-Id: I4163edc80ffcca61db7ab2a1e14ae8c14aab2347
Merged-In: I4163edc80ffcca61db7ab2a1e14ae8c14aab2347
(cherry picked from commit 4c2f079dad503315b599d85c3600a23fac8e19e4)
---
 libstats/include/stats_event_list.h | 3 +++
 libstats/stats_event_list.c         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libstats/include/stats_event_list.h b/libstats/include/stats_event_list.h
index b5bc5af50..037db13a2 100644
--- a/libstats/include/stats_event_list.h
+++ b/libstats/include/stats_event_list.h
@@ -18,6 +18,7 @@
 #define ANDROID_STATS_LOG_STATS_EVENT_LIST_H
 
 #include <log/log_event_list.h>
+#include <sys/uio.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,6 +28,8 @@ int write_to_logger(android_log_context context, log_id_t id);
 void note_log_drop(int error);
 void stats_log_close();
 int android_log_write_char_array(android_log_context ctx, const char* value, size_t len);
+extern int (*write_to_statsd)(struct iovec* vec, size_t nr);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libstats/stats_event_list.c b/libstats/stats_event_list.c
index 5b9036108..404b2b68f 100644
--- a/libstats/stats_event_list.c
+++ b/libstats/stats_event_list.c
@@ -41,7 +41,7 @@ typedef struct {
 extern struct android_log_transport_write statsdLoggerWrite;
 
 static int __write_to_statsd_init(struct iovec* vec, size_t nr);
-static int (*write_to_statsd)(struct iovec* vec, size_t nr) = __write_to_statsd_init;
+int (*write_to_statsd)(struct iovec* vec, size_t nr) = __write_to_statsd_init;
 
 // Similar to create_android_logger(), but instead of allocation a new buffer,
 // this function resets the buffer for resuse.