Mesa (9.0): android: fix liblog API changes

[Chad Versace]

Module: Mesa
Branch: 9.0
Commit: 2a69de60bf9d8a4b35a115a0b1ac115301dd954d
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a69de60bf9d8a4b35a115a0b1ac115301dd954d

Author: Tapani Pälli <tapani.pa...@intel.com>
Date:   Mon Aug 13 09:03:06 2012 +0300

android: fix liblog API changes

android logging macros changed their name in JellyBean.

Signed-off-by: Bruce E. Robertson <bruce.e.robert...@intel.com>
Signed-off-by: Tapani Pälli <tapani.pa...@intel.com>
Signed-off-by: Chad Versace <chad.vers...@linux.intel.com>
(cherry picked from commit 29d394b9ba4d7a23524fc6fba6da6e043085744b)

---

 src/egl/drivers/dri2/platform_android.c |   17 ++++++++++++++---
 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 66142cd..7e57295 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);

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit