commit afc9bc01b4f8a239b5f1a1c695b941a7d0ab8825
author Dan Albert <danalbert@google.com> Tue Aug 19 17:18:34 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Aug 16 04:03:35 2014 +0000
tree 4426218dcfaadc89665f428ca745a6d2a75c4f04
parent 8fd1f27ed866169684f44f24aeaa5c4722427d18
parent 4047075da6e3796c759e439d4f0bbbac8d2c03f3

Merge "Update for public android_set_abort_message()."

liblog/logd_write.c

diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index 3171c78..3659676 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 @@
 
 #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
 

liblog/logd_write_kern.c

diff --git a/liblog/logd_write_kern.c b/liblog/logd_write_kern.c
index 1ed5ecf..ae621cb 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 @@
 
 #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