| commit | 5c24cf3ed6dda31818a7b56f18b23feb77439a8d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Nov 30 01:45:48 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 30 01:45:48 2022 +0000 |
| tree | 8d66d917a751db64ea4a9304d6ec83e813ca2e92 | |
| parent | ac863e8b6d74028abba053ae7abb743719c15852 [diff] | |
| parent | 6931548346aaf25f0790308ceb9ed484df98ada4 [diff] |
Merge "libbinder: Add __assert in Trusty" am: 6931548346 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2283239 Change-Id: Ie9153d27053b68c6e3f3c11e6501d388a860095a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/trusty/include/log/log.h b/libs/binder/trusty/include/log/log.h index bf877a3..d88d18a 100644 --- a/libs/binder/trusty/include/log/log.h +++ b/libs/binder/trusty/include/log/log.h
@@ -120,3 +120,7 @@ do { \ 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); +}