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

Commit b7b0eaff authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 1d9f784f: am 0ffaa2b7: Merge "Fix __android_log_assert to abort." 

* commit '1d9f784f':
  Fix __android_log_assert to abort.
parents a746624a 1d9f784f

liblog/logd_write.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ void __android_log_assert(const char *cond, const char *tag, 
    }



    __android_log_write(ANDROID_LOG_FATAL, tag, buf);

    __builtin_trap(); /* trap so we have a chance to debug the situation */

    abort(); /* abort so we have a chance to debug the situation */

    /* NOTREACHED */

}

liblog/logd_write_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ void __android_log_assert(const char *cond, const char *tag, 
    }



    __android_log_write(ANDROID_LOG_FATAL, tag, buf);

    __builtin_trap(); /* trap so we have a chance to debug the situation */

    abort(); /* abort so we have a chance to debug the situation */

    /* NOTREACHED */

}