[libcxx-commits] [libcxxabi] 9fd9263 - [libc++abi] Remove support for Android 4 and older (#124054)

[via libcxx-commits]

Author: Brad Smith
Date: 2025-01-23T10:26:02+01:00
New Revision: 9fd92634749c75b39be829c22240567ccda3ffce

URL: https://github.com/llvm/llvm-project/commit/9fd92634749c75b39be829c22240567ccda3ffce
DIFF: https://github.com/llvm/llvm-project/commit/9fd92634749c75b39be829c22240567ccda3ffce.diff

LOG: [libc++abi] Remove support for Android 4 and older (#124054)

Added: 
    

Modified: 
    libcxxabi/src/abort_message.cpp

Removed: 
    


################################################################################
diff  --git a/libcxxabi/src/abort_message.cpp b/libcxxabi/src/abort_message.cpp
index 9e5a984807e2c3..d51d9d87d35e02 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();