diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-18 17:29:34 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-08-19 10:39:46 -0700 |
| commit | c68fedce06da19de4fde0ae0683ad2a8916586f7 (patch) | |
| tree | 8494051c0e16811423d5f42939a53da34cdb8009 /liblog | |
| parent | 342a2264b96ab05dc8fdbfa8bbe354ce2f4b06ca (diff) | |
| download | system_core-c68fedce06da19de4fde0ae0683ad2a8916586f7.zip system_core-c68fedce06da19de4fde0ae0683ad2a8916586f7.tar.gz system_core-c68fedce06da19de4fde0ae0683ad2a8916586f7.tar.bz2 | |
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
(cherry picked from commit 4047075da6e3796c759e439d4f0bbbac8d2c03f3)
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/logd_write.c | 7 | ||||
| -rw-r--r-- | 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 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 @@ 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 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 @@ 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 |