diff options
-rw-r--r-- | libs/binder/trusty/include/log/log.h | 8 |
1 files 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__ |