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
This commit is contained in:
Elliott Hughes 2015-03-07 11:21:37 -08:00
parent 6385d626a5
commit 02ff4b8feb
2 changed files with 2 additions and 2 deletions

View File

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

View File

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