From 02ff4b8febf5e2355cfa2b141df3971d21ed1424 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 7 Mar 2015 11:21:37 -0800 Subject: [PATCH] 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 --- liblog/logd_write.c | 2 +- liblog/logd_write_kern.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/liblog/logd_write.c b/liblog/logd_write.c index cd0a2161b..a8650938f 100644 --- a/liblog/logd_write.c +++ b/liblog/logd_write.c @@ -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 */ } diff --git a/liblog/logd_write_kern.c b/liblog/logd_write_kern.c index 2ca3c94e7..ca630672e 100644 --- a/liblog/logd_write_kern.c +++ b/liblog/logd_write_kern.c @@ -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 */ }