From 8fcb79e86cbb6c29555867c1fa36dd1ea2f0e79a Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Mon, 10 Sep 2012 01:11:49 +0200
Subject: [PATCH] (Android) Add logging

---
 android/jni/Android.mk |  2 +-
 retroarch_logger.h     | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 20570b913c..3e94ee248e 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -9,6 +9,6 @@ LOCAL_SRC_FILES    = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c
 
 LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99
 
-LOCAL_LDLIBS	:= -lGLESv2
+LOCAL_LDLIBS	:= -lGLESv2 -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/retroarch_logger.h b/retroarch_logger.h
index 1b93f81c3b..0662aff6a0 100644
--- a/retroarch_logger.h
+++ b/retroarch_logger.h
@@ -17,12 +17,18 @@
 #ifndef __RARCH_LOGGER_H
 #define __RARCH_LOGGER_H
 
+#ifdef ANDROID
+#include <android/log.h>
+#endif
+
 #if defined(RARCH_CONSOLE) && (defined(HAVE_LOGGER) || defined(HAVE_FILE_LOGGER) || defined(_XBOX1))
 #include <logger_override.h>
 #else
 
 #ifndef RARCH_LOG
-#ifdef IS_SALAMANDER
+#if defined(ANDROID)
+#define  RARCH_LOG(...)  __android_log_print(ANDROID_LOG_INFO,"RetroArch: ",__VA_ARGS__)
+#elif defined(IS_SALAMANDER)
 #define RARCH_LOG(...) do { \
       fprintf(stderr, "RetroArch Salamander: " __VA_ARGS__); \
       fflush(stderr); \
@@ -39,7 +45,9 @@
 #endif
 
 #ifndef RARCH_ERR
-#ifdef IS_SALAMANDER
+#if defined(ANDROID)
+#define  RARCH_ERR(...)  __android_log_print(ANDROID_LOG_INFO, "RetroArch [ERROR] :: ",__VA_ARGS__)
+#elif defined(IS_SALAMANDER)
 #define RARCH_ERR(...) do { \
       fprintf(stderr, "RetroArch Salamander [ERROR] :: " __VA_ARGS__); \
       fflush(stderr); \
@@ -53,7 +61,9 @@
 #endif
 
 #ifndef RARCH_WARN
-#ifdef IS_SALAMANDER
+#if defined(ANDROID)
+#define  RARCH_WARN(...)  __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: ",__VA_ARGS__)
+#elif defined(IS_SALAMANDER)
 #define RARCH_WARN(...) do { \
       fprintf(stderr, "RetroArch Salamander [WARN] :: " __VA_ARGS__); \
       fflush(stderr); \