Commit MetaInfo
Message de Log
android: print debug info to logcat
Redirect logs printed to stderr to logcat.
Change-Id: I58e3966a608af361b86c54b4c95a92561b711968
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Reviewed-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Change Summary
Modification
| | @@ -46,8 +46,10 @@ | | 46 | 46 | | | 47 | 47 | #endif | | 48 | 48 | | | 49 | | - | | 50 | | -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) | | 49 | +#if defined(PIPE_OS_ANDROID) | | 50 | +# define LOG_TAG "gallium" | | 51 | +# include <log/log.h> | | 52 | +#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS) | | 51 | 53 | # include <unistd.h> | | 52 | 54 | #elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD) | | 53 | 55 | # include <sys/sysctl.h> |
| | @@ -100,6 +102,12 @@ os_log_message(const char *message) | | 100 | 102 | fflush(fout); | | 101 | 103 | } | | 102 | 104 | #else /* !PIPE_SUBSYSTEM_WINDOWS */ | | 105 | +#if defined(PIPE_OS_ANDROID) | | 106 | + if (fout == stderr) { | | 107 | + ALOGD("%s", message); | | 108 | + return; | | 109 | + } | | 110 | +#endif | | 103 | 111 | fflush(stdout); | | 104 | 112 | fputs(message, fout); | | 105 | 113 | fflush(fout); |
| | @@ -55,7 +55,7 @@ void | | 55 | 55 | _debug_vprintf(const char *format, va_list ap) | | 56 | 56 | { | | 57 | 57 | static char buf[4096] = {'\0'}; | | 58 | | -#if defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_EMBEDDED) | | 58 | +#if defined(PIPE_OS_WINDOWS) || defined(PIPE_OS_ANDROID) || defined(PIPE_SUBSYSTEM_EMBEDDED) | | 59 | 59 | /* We buffer until we find a newline. */ | | 60 | 60 | size_t len = strlen(buf); | | 61 | 61 | int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap); |
| | @@ -41,6 +41,7 @@ LOCAL_LDFLAGS := \ | | 41 | 41 | | | 42 | 42 | LOCAL_SHARED_LIBRARIES := \ | | 43 | 43 | libdl \ | | 44 | + liblog \ | | 44 | 45 | libglapi \ | | 45 | 46 | libexpat \ | | 46 | 47 | libz |
| | @@ -36,6 +36,10 @@ | | 36 | 36 | #include "context.h" | | 37 | 37 | #include "debug_output.h" | | 38 | 38 | | | 39 | +#if defined(ANDROID) | | 40 | +# define LOG_TAG "mesa" | | 41 | +# include <log/log.h> | | 42 | +#endif | | 39 | 43 | | | 40 | 44 | static FILE *LogFile = NULL; | | 41 | 45 | |
| | @@ -89,6 +93,10 @@ output_if_debug(const char *prefixString, const char *outputString, | | 89 | 93 | _mesa_snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : ""); | | 90 | 94 | OutputDebugStringA(buf); | | 91 | 95 | } | | 96 | +#elif defined(ANDROID) | | 97 | + { | | 98 | + ALOGD("%s: %s", prefixString, outputString); | | 99 | + } | | 92 | 100 | #endif | | 93 | 101 | } | | 94 | 102 | } |
Afficher sur ancien navigateur de dépôt.
|
Android-x86
Fork
src/gallium/auxiliary/os/os_misc.c
src/gallium/targets/dri/Android.mk