diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-19 17:32:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-19 17:32:54 +0000 |
| commit | 8c9cbb214c161eac0c723f4f887965006bd9f108 (patch) | |
| tree | 74d3eafc4dceeb482b2c0c6f2f1640c9464689c8 | |
| parent | 25ec0d4d961624a2fe6147f8d8e1cf641e26a3ef (diff) | |
| parent | 5c16eb07721252a8a5d8ad436319e94d7c974e44 (diff) | |
| download | system_core-8c9cbb214c161eac0c723f4f887965006bd9f108.zip system_core-8c9cbb214c161eac0c723f4f887965006bd9f108.tar.gz system_core-8c9cbb214c161eac0c723f4f887965006bd9f108.tar.bz2 | |
am 5c16eb07: am afc9bc01: Merge "Update for public android_set_abort_message()."
* commit '5c16eb07721252a8a5d8ad436319e94d7c974e44':
Update for public android_set_abort_message().
| -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 |