commit 818a58f31a20f96b28293f480695070c7c337d7d
author Elliott Hughes <enh@google.com> Mon Mar 09 15:21:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 09 15:21:46 2015 +0000
tree d7a75461032bef739f82752befd2ea9b97722e51
parent e1a06dc25315beea9d46710e606ab4423208b5fc
parent 000d8fbe3ccbadc7af9166f99adf2d4f99e8933e

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

* commit '0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370':
  Fix __android_log_assert to abort.

liblog/logd_write.c

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 @@
     }
 
     __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

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 @@
     }
 
     __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 */
 }