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

Commit 02ff4b8f authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Fix __android_log_assert to abort. 

If you rely on __builtin_trap, it's likely to use an illegal instruction,
which is a misleading way to abort. If we just call abort, it's more
immediately obvious that we've aborted.

Bug: 19644330
Change-Id: I63a962e4748aec7b019ea94b007593e478a3b61a
parent 6385d626

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 */

}