commit 55d44b74d411cecd906c72db5a89dd5f5eb9e1f8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Dec 12 21:00:07 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 12 21:00:07 2023 +0000
tree 237f8a87dcbef2636cddfa0ed22a322ff53da3ed
parent 40629347f68909286e7c6e8710a2d6b040bfc7db
parent 5540e5d0c22b7ed76b6e650947c5671addfb47e6

Merge "Fix Linux Binder warning on gcc" into main

libs/binder/liblog_stub/include/log/log.h

diff --git a/libs/binder/liblog_stub/include/log/log.h b/libs/binder/liblog_stub/include/log/log.h
index 3b65607..91c9632 100644
--- a/libs/binder/liblog_stub/include/log/log.h
+++ b/libs/binder/liblog_stub/include/log/log.h
@@ -35,15 +35,19 @@
     return ANDROID_LOG_STUB_MIN_PRIORITY <= priority;
 }
 
-int __android_log_print(int prio, const char* tag, const char* fmt, ...)
-        __attribute__((format(printf, 3, 4)))
 #ifdef ANDROID_LOG_STUB_WEAK_PRINT
-        __attribute__((weak))
+#define __ANDROID_LOG_STUB_IS_PRINT_PRESENT __android_log_print
+#define __ANDROID_LOG_STUB_PRINT_ATTR __attribute__((weak))
+#else
+#define __ANDROID_LOG_STUB_IS_PRINT_PRESENT true
+#define __ANDROID_LOG_STUB_PRINT_ATTR
 #endif
-        ;
+
+int __android_log_print(int prio, const char* tag, const char* fmt, ...)
+        __attribute__((format(printf, 3, 4))) __ANDROID_LOG_STUB_PRINT_ATTR;
 
 #define IF_ALOG(priority, tag) \
-    if (__android_log_stub_is_loggable(ANDROID_##priority) && __android_log_print)
+    if (__android_log_stub_is_loggable(ANDROID_##priority) && __ANDROID_LOG_STUB_IS_PRINT_PRESENT)
 #define IF_ALOGV() IF_ALOG(LOG_VERBOSE, LOG_TAG)
 #define IF_ALOGD() IF_ALOG(LOG_DEBUG, LOG_TAG)
 #define IF_ALOGI() IF_ALOG(LOG_INFO, LOG_TAG)