Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7073b239 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Linux Binder warning on gcc" into main am: 55d44b74 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2871055



Change-Id: I80e30a9c1641e4d396b4a6dc0468d74fe429228b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e68dda5 55d44b74

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

+9 −5
Original line number Original line Diff line number Diff line
@@ -35,15 +35,19 @@ constexpr bool __android_log_stub_is_loggable(android_LogPriority priority) { 
    return ANDROID_LOG_STUB_MIN_PRIORITY <= 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

#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

#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) \

#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_ALOGV() IF_ALOG(LOG_VERBOSE, LOG_TAG)

#define IF_ALOGD() IF_ALOG(LOG_DEBUG, LOG_TAG)

#define IF_ALOGD() IF_ALOG(LOG_DEBUG, LOG_TAG)

#define IF_ALOGI() IF_ALOG(LOG_INFO, LOG_TAG)

#define IF_ALOGI() IF_ALOG(LOG_INFO, LOG_TAG)