From ae089a7b586b71cfe62c1c3e9450f129a0c1253f Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Sun, 16 Dec 2012 04:13:31 +0100
Subject: [PATCH] (Android) Make logging optional

---
 android/native/jni/Android.mk | 10 ++++++----
 console/griffin/griffin.c     |  2 +-
 retroarch_logger.h            | 14 +++++++-------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index 11e211ed1e..965a997ff6 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -1,9 +1,9 @@
 RARCH_VERSION		= "0.9.8-beta3"
 LOCAL_PATH := $(call my-dir)
 PERF_TEST := 0
-HAVE_OPENSL     := 1
 HAVE_NEON := 1
 HAVE_SINC := 1
+HAVE_LOGGER := 1
 
 include $(CLEAR_VARS)
 
@@ -44,6 +44,10 @@ RARCH_PATH  := ../../..
 LIBXML_PATH := ../../../deps/libxml2
 LOCAL_SRC_FILES  +=	$(RARCH_PATH)/console/griffin/griffin.c
 
+ifeq ($(HAVE_LOGGER), 1)
+LOCAL_CFLAGS += -DHAVE_LOGGER
+LOGGER_LDLIBS := -llog
+endif
 
 ifeq ($(PERF_TEST), 1)
 LOCAL_CFLAGS += -DPERF_TEST
@@ -51,12 +55,10 @@ endif
 
 LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
 
-LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl
+LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl
 LOCAL_C_INCLUDES += $(LIBXML_PATH)
 
-ifeq ($(HAVE_OPENSL), 1)
 LOCAL_CFLAGS += -DHAVE_SL
 LOCAL_LDLIBS += -lOpenSLES
-endif
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 26fdb654e5..076071c065 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -24,7 +24,7 @@ LOGGERS
 
 #if defined(HAVE_LOGGER) && defined(__PSL1GHT__)
 #include "../logger/psl1ght_logger.c"
-#elif defined(HAVE_LOGGER)
+#elif defined(HAVE_LOGGER) && !defined(ANDROID)
 #include "../logger/logger.c"
 #endif
 
diff --git a/retroarch_logger.h b/retroarch_logger.h
index 838019e9b8..892b906f6a 100644
--- a/retroarch_logger.h
+++ b/retroarch_logger.h
@@ -17,7 +17,7 @@
 #ifndef __RARCH_LOGGER_H
 #define __RARCH_LOGGER_H
 
-#ifdef ANDROID
+#if defined(ANDROID) && defined(HAVE_LOGGER)
 #include <android/log.h>
 #endif
 
@@ -32,7 +32,7 @@
 #else
 
 #ifndef RARCH_LOG
-#if defined(ANDROID)
+#if defined(ANDROID) && defined(HAVE_LOGGER)
 #define  RARCH_LOG(...)  __android_log_print(ANDROID_LOG_INFO, "RetroArch: ", __VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_LOG(...) do { \
@@ -51,7 +51,7 @@
 #endif
 
 #ifndef RARCH_LOG_OUTPUT
-#if defined(ANDROID)
+#if defined(ANDROID) && defined(HAVE_LOGGER)
 #define  RARCH_LOG_OUTPUT(...)  __android_log_print(ANDROID_LOG_INFO,"stderr: ",__VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_LOG_OUTPUT(...) do { \
@@ -70,7 +70,7 @@
 #endif
 
 #ifndef RARCH_ERR
-#if defined(ANDROID)
+#if defined(ANDROID) && defined(HAVE_LOGGER)
 #define  RARCH_ERR(...)  __android_log_print(ANDROID_LOG_INFO, "RetroArch [ERROR] :: ", __VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_ERR(...) do { \
@@ -86,7 +86,7 @@
 #endif
 
 #ifndef RARCH_ERR_OUTPUT
-#if defined(ANDROID)
+#if defined(ANDROID) && defined(HAVE_LOGGER)
 #define  RARCH_ERR_OUTPUT(...)  __android_log_print(ANDROID_LOG_INFO, "stderr [ERROR] :: ", __VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_ERR_OUTPUT(...) do { \
@@ -102,7 +102,7 @@
 #endif
 
 #ifndef RARCH_WARN
-#if defined(ANDROID)
+#if defined(ANDROID) && defined(HAVE_LOGGER)
 #define  RARCH_WARN(...)  __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: ", __VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_WARN(...) do { \
@@ -118,7 +118,7 @@
 #endif
 
 #ifndef RARCH_WARN
-#if defined(ANDROID)
+#if defined(ANDROID) && defined(HAVE_LOGGER)
 #define  RARCH_WARN_OUTPUT(...)  __android_log_print(ANDROID_LOG_INFO, "stderr [WARN] :: ", __VA_ARGS__)
 #elif defined(IS_SALAMANDER)
 #define RARCH_WARN_OUTPUT(...) do { \