am 8c9cbb21: am 5c16eb07: am afc9bc01: Merge "Update for public android_set_abort_message()."

* commit '8c9cbb214c161eac0c723f4f887965006bd9f108':
  Update for public android_set_abort_message().
This commit is contained in:
Dan Albert 2014-08-19 17:43:21 +00:00 committed by Android Git Automerger
commit a79ad128b2
2 changed files with 10 additions and 4 deletions

View File

@ -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

View File

@ -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