Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c9cbb21 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

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

* commit '5c16eb07':
  Update for public android_set_abort_message().
parents 25ec0d4d 5c16eb07

liblog/logd_write.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -31,6 +31,10 @@ 
#include <time.h>

#include <time.h>

#include <unistd.h>

#include <unistd.h>





#ifdef __BIONIC__

#include <android/set_abort_message.h>

#endif



#include <log/logd.h>

#include <log/logd.h>

#include <log/logger.h>

#include <log/logger.h>

#include <log/log_read.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 __BIONIC__

    if (prio == ANDROID_LOG_FATAL) {

    if (prio == ANDROID_LOG_FATAL) {

        extern void __android_set_abort_message(const char*);

        android_set_abort_message(msg);

        __android_set_abort_message(msg);

    }

    }

#endif

#endif

liblog/logd_write_kern.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -28,6 +28,10 @@ 
#include <time.h>

#include <time.h>

#include <unistd.h>

#include <unistd.h>





#ifdef __BIONIC__

#include <android/set_abort_message.h>

#endif



#include <log/log.h>

#include <log/log.h>

#include <log/logd.h>

#include <log/logd.h>

#include <log/logger.h>

#include <log/logger.h>
@@ -177,8 +181,7 @@ int __android_log_write(int prio, const char *tag, const char *msg) 




#if __BIONIC__

#if __BIONIC__

    if (prio == ANDROID_LOG_FATAL) {

    if (prio == ANDROID_LOG_FATAL) {

        extern void __android_set_abort_message(const char*);

        android_set_abort_message(msg);

        __android_set_abort_message(msg);

    }

    }

#endif

#endif