diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-09 15:14:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-09 15:14:52 +0000 |
| commit | 0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370 (patch) | |
| tree | 4c48f81e700533baef2579307335476562c1e0b0 | |
| parent | 6385d626a585017ec1fe4027f4faa79741f9d117 (diff) | |
| parent | 02ff4b8febf5e2355cfa2b141df3971d21ed1424 (diff) | |
| download | system_core-0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370.zip system_core-0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370.tar.gz system_core-0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370.tar.bz2 | |
Merge "Fix __android_log_assert to abort."
| -rw-r--r-- | liblog/logd_write.c | 2 | ||||
| -rw-r--r-- | 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 cd0a216..a865093 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 2ca3c94..ca63067 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 */ } |