diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-12 22:20:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-12 22:20:54 +0000 |
| commit | c860791d944c88829ca86673fa71dc8ddab8b292 (patch) | |
| tree | 585024f383043ac6c3977cfa2099604a2bf5ffbb | |
| parent | 54206636dace763e6df86db73317146424d2976f (diff) | |
| parent | 7073b239355fb716a5e4b17feec1aa421f03d204 (diff) | |
| download | native-c860791d944c88829ca86673fa71dc8ddab8b292.tar.gz | |
Merge "Fix Linux Binder warning on gcc" into main am: 55d44b74d4 am: 7073b23935
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2871055
Change-Id: Ib8e91977d577cbee6c3cd0c998de2880497bca89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/liblog_stub/include/log/log.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libs/binder/liblog_stub/include/log/log.h b/libs/binder/liblog_stub/include/log/log.h index 3b656076b3..91c9632c1b 100644 --- a/libs/binder/liblog_stub/include/log/log.h +++ b/libs/binder/liblog_stub/include/log/log.h @@ -35,15 +35,19 @@ constexpr bool __android_log_stub_is_loggable(android_LogPriority priority) { 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) |