From 506924b01c3dbf69fdf4d62ddc90789501ca9e57 Mon Sep 17 00:00:00 2001
From: Larpon <Larpon@users.noreply.github.com>
Date: Fri, 22 Oct 2021 18:59:25 +0200
Subject: [PATCH] android: hide printf hijack for android logging behind define
 (#12269)

---
 thirdparty/sokol/sokol_v.pre.h | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/thirdparty/sokol/sokol_v.pre.h b/thirdparty/sokol/sokol_v.pre.h
index 4b35d582fb..703f6fb664 100644
--- a/thirdparty/sokol/sokol_v.pre.h
+++ b/thirdparty/sokol/sokol_v.pre.h
@@ -1,19 +1,21 @@
-#if defined(__ANDROID__)
-	// Adapted from https://stackoverflow.com/a/196018/1904615
-	#define V_ANDROID_LOG_STR_VALUE(arg) #arg
-	#define V_ANDROID_LOG_NAME(tag_name) V_ANDROID_LOG_STR_VALUE(tag_name)
+#if defined(V_ANDROID_LOG_PRINT)
+	#if defined(__ANDROID__)
+		// Adapted from https://stackoverflow.com/a/196018/1904615
+		#define V_ANDROID_LOG_STR_VALUE(arg) #arg
+		#define V_ANDROID_LOG_NAME(tag_name) V_ANDROID_LOG_STR_VALUE(tag_name)
 
-	#ifndef V_ANDROID_LOG_TAG
-		#if defined(APPNAME)
-			#define V_ANDROID_LOG_TAG APPNAME
-		#else
-			#define V_ANDROID_LOG_TAG "V_ANDROID"
+		#ifndef V_ANDROID_LOG_TAG
+			#if defined(APPNAME)
+				#define V_ANDROID_LOG_TAG APPNAME
+			#else
+				#define V_ANDROID_LOG_TAG "V_ANDROID"
+			#endif
 		#endif
+
+		#define V_ANDROID_LOG_TAG_NAME V_ANDROID_LOG_NAME(V_ANDROID_LOG_TAG)
+
+		#include <android/log.h>
+		#define printf(...) __android_log_print(ANDROID_LOG_INFO, V_ANDROID_LOG_TAG_NAME, __VA_ARGS__)
+		#define fprintf(a, ...) __android_log_print(ANDROID_LOG_ERROR, V_ANDROID_LOG_TAG_NAME, __VA_ARGS__)
 	#endif
-
-	#define V_ANDROID_LOG_TAG_NAME V_ANDROID_LOG_NAME(V_ANDROID_LOG_TAG)
-
-	#include <android/log.h>
-	#define printf(...) __android_log_print(ANDROID_LOG_INFO, V_ANDROID_LOG_TAG_NAME, __VA_ARGS__)
-	#define fprintf(a, ...) __android_log_print(ANDROID_LOG_ERROR, V_ANDROID_LOG_TAG_NAME, __VA_ARGS__)
 #endif