commit 000d8fbe3ccbadc7af9166f99adf2d4f99e8933e
author Elliott Hughes <enh@google.com> Mon Mar 09 15:14:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 09 15:14:52 2015 +0000
tree 4c48f81e700533baef2579307335476562c1e0b0
parent 1279a4ca3deabe01e0288630ed0bee9723450237
parent 613cc7c332498400db68216499e4ca1476a20bc4

Merge "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 */
 }