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

Commit 16759fc3 authored by Andrei Homescu's avatar Andrei Homescu
Browse files

libbinder: Fix __assert macro in Trusty 

Override the definition of __assert from the
binder_status.h header when building without bionic.
The definition in that header uses syslog() to
print the assertion message, and this function
is not available in Trusty.

Bug: 230135749
Test: m
Test: build on Trusty
Change-Id: I3fe849a021110f78127f70017bff0f1bad868500
parent 8a049003

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__