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

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

Merge "libbinder: Fix __assert macro in Trusty" am: 7e560fe5 am: a8ee5dca am: fd98ecbb 

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



Change-Id: Ib0f04ef39b4a74e4a7074f0f72db898ac214ebf6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bfdbff01 fd98ecbb

libs/binder/trusty/include/log/log.h

+5 −3
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ static inline void __ignore_va_args__(...) {} 
        TLOGE("android_errorWriteLog: tag:%x subTag:%s\n", tag, subTag); \

    } while (0)



extern "C" inline void __assert(const char* file, int line, const char* str) {

    LOG_ALWAYS_FATAL("%s:%d: assertion \"%s\" failed", file, line, str);

}
 
// Override the definition of __assert from binder_status.h

#ifndef __BIONIC__

#undef __assert

#define __assert(file, line, str) LOG_ALWAYS_FATAL("%s:%d: %s", file, line, str)

#endif // __BIONIC__