summaryrefslogtreecommitdiff
path: root/libcxxabi
diff options
context:
space:
mode:
authorBrad Smith <brad@comstyle.com>2025-01-23 04:26:02 -0500
committerGitHub <noreply@github.com>2025-01-23 10:26:02 +0100
commit9fd92634749c75b39be829c22240567ccda3ffce (patch)
tree4caf4423bb02d3bc8432a9a3a9533954245284a7 /libcxxabi
parentd7c14c8f976fd291984e0c7eed75dd3331b1ed6d (diff)
[libc++abi] Remove support for Android 4 and older (#124054)
Diffstat (limited to 'libcxxabi')
-rw-r--r--libcxxabi/src/abort_message.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/libcxxabi/src/abort_message.cpp b/libcxxabi/src/abort_message.cpp
index 9e5a984807e2..d51d9d87d35e 100644
--- a/libcxxabi/src/abort_message.cpp
+++ b/libcxxabi/src/abort_message.cpp
@@ -12,13 +12,8 @@
#include "abort_message.h"
#ifdef __BIONIC__
-# include <android/api-level.h>
-# if __ANDROID_API__ >= 21
-# include <syslog.h>
- extern "C" void android_set_abort_message(const char* msg);
-# else
-# include <assert.h>
-# endif // __ANDROID_API__ >= 21
+# include <syslog.h>
+extern "C" void android_set_abort_message(const char* msg);
#endif // __BIONIC__
#if defined(__APPLE__) && __has_include(<CrashReporterClient.h>)
@@ -59,7 +54,6 @@ void __abort_message(const char* format, ...)
vasprintf(&buffer, format, list);
va_end(list);
-# if __ANDROID_API__ >= 21
// Show error in tombstone.
android_set_abort_message(buffer);
@@ -67,12 +61,6 @@ void __abort_message(const char* format, ...)
openlog("libc++abi", 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 // __BIONIC__
abort();