From 16759fc36124f2b76d9fd394eecb34ae0969bbe8 Mon Sep 17 00:00:00 2001 From: Andrei Homescu Date: Wed, 30 Nov 2022 06:26:17 +0000 Subject: 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 --- libs/binder/trusty/include/log/log.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/binder/trusty/include/log/log.h b/libs/binder/trusty/include/log/log.h index d88d18a7be..de84617343 100644 --- a/libs/binder/trusty/include/log/log.h +++ b/libs/binder/trusty/include/log/log.h @@ -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__ -- cgit v1.2.3-59-g8ed1b