From 4047075da6e3796c759e439d4f0bbbac8d2c03f3 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Mon, 18 Aug 2014 17:29:34 -0700
Subject: [PATCH] Update for public android_set_abort_message().

Since android_set_abort_message() is quite helpful to the platform, it's
becoming promoted to a real header with a non-private name.

Bug: 17059126
Change-Id: I3ed12b66eb07f3a6a08366d5eee147809d9a3ce9
---
 liblog/logd_write.c      | 7 +++++--
 liblog/logd_write_kern.c | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index 3171c78e1..365967633 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -31,6 +31,10 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifdef __BIONIC__
+#include <android/set_abort_message.h>
+#endif
+
 #include <log/logd.h>
 #include <log/logger.h>
 #include <log/log_read.h>
@@ -333,8 +337,7 @@ int __android_log_write(int prio, const char *tag, const char *msg)
 
 #if __BIONIC__
     if (prio == ANDROID_LOG_FATAL) {
-        extern void __android_set_abort_message(const char*);
-        __android_set_abort_message(msg);
+        android_set_abort_message(msg);
     }
 #endif
 
diff --git a/liblog/logd_write_kern.c b/liblog/logd_write_kern.c
index 1ed5ecfbf..ae621cb13 100644
--- a/liblog/logd_write_kern.c
+++ b/liblog/logd_write_kern.c
@@ -28,6 +28,10 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifdef __BIONIC__
+#include <android/set_abort_message.h>
+#endif
+
 #include <log/log.h>
 #include <log/logd.h>
 #include <log/logger.h>
@@ -177,8 +181,7 @@ int __android_log_write(int prio, const char *tag, const char *msg)
 
 #if __BIONIC__
     if (prio == ANDROID_LOG_FATAL) {
-        extern void __android_set_abort_message(const char*);
-        __android_set_abort_message(msg);
+        android_set_abort_message(msg);
     }
 #endif