| Revision | 9d2a4cc3a16b5b464fda0a0c321dd1f5acadaa33 (tree) |
|---|---|
| Zeit | 2019-01-11 18:19:39 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Android: redirect debug messages to logcat
Android.mk (diff)
xf86drm.c (diff)| @@ -97,6 +97,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ | ||
| 97 | 97 | $(LOCAL_PATH)/android |
| 98 | 98 | |
| 99 | 99 | LOCAL_SHARED_LIBRARIES := \ |
| 100 | + liblog \ | |
| 100 | 101 | libcutils |
| 101 | 102 | |
| 102 | 103 | LOCAL_C_INCLUDES := \ |
| @@ -69,6 +69,10 @@ | ||
| 69 | 69 | |
| 70 | 70 | #include "util_math.h" |
| 71 | 71 | |
| 72 | +#ifdef __ANDROID__ | |
| 73 | +#include <log/log.h> | |
| 74 | +#endif | |
| 75 | + | |
| 72 | 76 | #ifdef __OpenBSD__ |
| 73 | 77 | #define DRM_PRIMARY_MINOR_NAME "drm" |
| 74 | 78 | #define DRM_CONTROL_MINOR_NAME "drmC" |
| @@ -138,16 +142,22 @@ drm_public void drmSetServerInfo(drmServerInfoPtr info) | ||
| 138 | 142 | static int DRM_PRINTFLIKE(1, 0) |
| 139 | 143 | drmDebugPrint(const char *format, va_list ap) |
| 140 | 144 | { |
| 145 | +#ifdef __ANDROID__ | |
| 146 | + return __android_log_vprint(ANDROID_LOG_DEBUG, "libdrm", format, ap); | |
| 147 | +#else | |
| 141 | 148 | return vfprintf(stderr, format, ap); |
| 149 | +#endif | |
| 142 | 150 | } |
| 143 | 151 | |
| 144 | 152 | drm_public void |
| 145 | 153 | drmMsg(const char *format, ...) |
| 146 | 154 | { |
| 147 | 155 | va_list ap; |
| 156 | +#ifndef __ANDROID__ | |
| 148 | 157 | const char *env; |
| 149 | 158 | if (((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose")) || |
| 150 | 159 | (drm_server_info && drm_server_info->debug_print)) |
| 160 | +#endif | |
| 151 | 161 | { |
| 152 | 162 | va_start(ap, format); |
| 153 | 163 | if (drm_server_info) { |
Android-x86
Fork