diff options
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/verbose_abort.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libcxx/src/verbose_abort.cpp b/libcxx/src/verbose_abort.cpp index 6704709..fd6bc49 100644 --- a/libcxx/src/verbose_abort.cpp +++ b/libcxx/src/verbose_abort.cpp @@ -13,13 +13,8 @@ #include <cstdlib> #ifdef __BIONIC__ -# include <android/api-level.h> -# if __ANDROID_API__ >= 21 -# include <syslog.h> +# include <syslog.h> extern "C" void android_set_abort_message(const char* msg); -# else -# include <assert.h> -# endif // __ANDROID_API__ >= 21 #endif // __BIONIC__ #if defined(__APPLE__) && __has_include(<CrashReporterClient.h>) @@ -54,7 +49,6 @@ _LIBCPP_WEAK void __libcpp_verbose_abort(char const* format, ...) _LIBCPP_VERBOS #elif defined(__BIONIC__) vasprintf(&buffer, format, list); -# if __ANDROID_API__ >= 21 // Show error in tombstone. android_set_abort_message(buffer); @@ -62,12 +56,6 @@ _LIBCPP_WEAK void __libcpp_verbose_abort(char const* format, ...) _LIBCPP_VERBOS openlog("libc++", 0, 0); syslog(LOG_CRIT, "%s", buffer); closelog(); -# else - // The good error reporting wasn't available in Android until L. Since we're - // about to abort anyway, just call __assert2, which will log _somewhere_ - // (tombstone and/or logcat) in older releases. - __assert2(__FILE__, __LINE__, __func__, buffer); -# endif // __ANDROID_API__ >= 21 #endif va_end(list); |