util: Explicitly call the unpack functions from inside bptc pack/unpack.

[mesa.git] / src / util / os_misc.c

diff --git a/src/util/os_misc.c b/src/util/os_misc.c
index 755970430b00ace5111a7c8bce05f5128308f98a..e6894731b635b754e028b4ac49b2da8769607a0c 100644 (file)
--- a/src/util/os_misc.c
+++ b/src/util/os_misc.c
@@ -38,6 +38,7 @@
 #endif
 #include <windows.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #else
 
@@ -47,7 +48,11 @@
 #endif
 
 
-#if DETECT_OS_LINUX || DETECT_OS_CYGWIN || DETECT_OS_SOLARIS || DETECT_OS_HURD
+#if DETECT_OS_ANDROID
+#  define LOG_TAG "MESA"
+#  include <unistd.h>
+#  include <log/log.h>
+#elif DETECT_OS_LINUX || DETECT_OS_CYGWIN || DETECT_OS_SOLARIS || DETECT_OS_HURD
 #  include <unistd.h>
 #elif DETECT_OS_APPLE || DETECT_OS_BSD
 #  include <sys/sysctl.h>
@@ -103,6 +108,9 @@ os_log_message(const char *message)
    fflush(stdout);
    fputs(message, fout);
    fflush(fout);
+#  if DETECT_OS_ANDROID
+   LOG_PRI(ANDROID_LOG_ERROR, LOG_TAG, "%s", message);
+#  endif
 #endif
 }