commit 7fc6fd6bba8b489ffd95bbf3de010fc2cc1d6de8
author Priyanka Advani (xWF) <padvani@google.com> Mon Dec 02 22:03:19 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 02 22:03:19 2024 +0000
tree f0053305b74c89772b7dbb2ac055c8fd531cbd91
parent ff6b0e2dc9559a28ce8ee8dc6e449dfdd659fc0f
parent e1a577fc8444aa996f65fb707677cf5b31a1745a

Merge "Revert "async-safe logging: __ANDROID_API_LEVEL__ isn't a thing."" into main

libc/async_safe/async_safe_log.cpp

diff --git a/libc/async_safe/async_safe_log.cpp b/libc/async_safe/async_safe_log.cpp
index c24b326..07133b7 100644
--- a/libc/async_safe/async_safe_log.cpp
+++ b/libc/async_safe/async_safe_log.cpp
@@ -359,7 +359,7 @@
       buffer[1] = 'x';
       format_integer(buffer + 2, sizeof(buffer) - 2, value, 'x');
     } else if (c == 'm') {
-#if __ANDROID_API__ >= 35 // This library is used in mainline modules.
+#if __ANDROID_API_LEVEL__ >= 35 // This library is used in mainline modules.
       if (alternate) {
         const char* name = strerrorname_np(errno);
         if (name) {

tests/async_safe_test.cpp

diff --git a/tests/async_safe_test.cpp b/tests/async_safe_test.cpp
index 8692c8a..ffb8651 100644
--- a/tests/async_safe_test.cpp
+++ b/tests/async_safe_test.cpp
@@ -79,13 +79,13 @@
   async_safe_format_buffer(buf, sizeof(buf), "a%mZ");
   EXPECT_STREQ("aInvalid argumentZ", buf);
 
-#if __ANDROID_API__ >= 35
+#if __ANDROID_API_LEVEL__ >= 35
   errno = EINVAL;
   async_safe_format_buffer(buf, sizeof(buf), "a%#mZ");
   EXPECT_STREQ("aEINVALZ", buf);
 #endif
 
-#if __ANDROID_API__ >= 35
+#if __ANDROID_API_LEVEL__ >= 35
   errno = -1;
   async_safe_format_buffer(buf, sizeof(buf), "a%#mZ");
   EXPECT_STREQ("a-1Z", buf);