support Android's logging system for fatal_error

GrapheneOS · Oct 19, 2020 · b5735c5 · b5735c5
1 parent b072022
commit b5735c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Android.bp b/Android.bp
@@ -56,6 +56,7 @@ cc_library {
     defaults: ["hardened_malloc_defaults"],
     srcs: lib_src_files,
     export_include_dirs: ["include"],
+    static_libs: ["libasync_safe"],
     target: {
         android: {
             shared: {

diff --git a/util.c b/util.c
@@ -4,6 +4,10 @@
 
 #include <unistd.h>
 
+#ifdef __ANDROID__
+#include <async_safe/log.h>
+#endif
+
 #include "util.h"
 
 static int write_full(int fd, const char *buf, size_t length) {
@@ -27,5 +31,8 @@ COLD noreturn void fatal_error(const char *s) {
     (void)(write_full(STDERR_FILENO, prefix, strlen(prefix)) != -1 &&
         write_full(STDERR_FILENO, s, strlen(s)) != -1 &&
         write_full(STDERR_FILENO, "\n", 1));
+#ifdef __ANDROID__
+    async_safe_fatal("fatal allocator error: %s", s);
+#endif
     abort();
 }