summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2012-08-13 09:03:06 +0300
committerChad Versace <[email protected]>2012-08-31 09:45:56 -0700
commit29d394b9ba4d7a23524fc6fba6da6e043085744b (patch)
treebf25900b85ad8eeedcab37335b11cfb996e1329a
parent4d02b018f456c447e2c24ebd1460c27d6e5fb385 (diff)
android: fix liblog API changes
android logging macros changed their name in JellyBean. Signed-off-by: Bruce E. Robertson <[email protected]> Signed-off-by: Tapani Pälli <[email protected]> Signed-off-by: Chad Versace <[email protected]>
-rw-r--r--src/egl/drivers/dri2/platform_android.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 66142cdee5f..7e57295e8fa 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -660,18 +660,29 @@ droid_open_device(void)
return (fd >= 0) ? dup(fd) : -1;
}
+/* support versions < JellyBean */
+#ifndef ALOGW
+#define ALOGW LOGW
+#endif
+#ifndef ALOGD
+#define ALOGD LOGD
+#endif
+#ifndef ALOGI
+#define ALOGI LOGI
+#endif
+
static void
droid_log(EGLint level, const char *msg)
{
switch (level) {
case _EGL_DEBUG:
- LOGD("%s", msg);
+ ALOGD("%s", msg);
break;
case _EGL_INFO:
- LOGI("%s", msg);
+ ALOGI("%s", msg);
break;
case _EGL_WARNING:
- LOGW("%s", msg);
+ ALOGW("%s", msg);
break;
case _EGL_FATAL:
LOG_FATAL("%s", msg);