Skip to content

Commit 506924b

Browse files
authored
android: hide printf hijack for android logging behind define (#12269)
1 parent 8273c05 commit 506924b

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

thirdparty/sokol/sokol_v.pre.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
#if defined(__ANDROID__)
2-
// Adapted from https://stackoverflow.com/a/196018/1904615
3-
#define V_ANDROID_LOG_STR_VALUE(arg) #arg
4-
#define V_ANDROID_LOG_NAME(tag_name) V_ANDROID_LOG_STR_VALUE(tag_name)
1+
#if defined(V_ANDROID_LOG_PRINT)
2+
#if defined(__ANDROID__)
3+
// Adapted from https://stackoverflow.com/a/196018/1904615
4+
#define V_ANDROID_LOG_STR_VALUE(arg) #arg
5+
#define V_ANDROID_LOG_NAME(tag_name) V_ANDROID_LOG_STR_VALUE(tag_name)
56

6-
#ifndef V_ANDROID_LOG_TAG
7-
#if defined(APPNAME)
8-
#define V_ANDROID_LOG_TAG APPNAME
9-
#else
10-
#define V_ANDROID_LOG_TAG "V_ANDROID"
7+
#ifndef V_ANDROID_LOG_TAG
8+
#if defined(APPNAME)
9+
#define V_ANDROID_LOG_TAG APPNAME
10+
#else
11+
#define V_ANDROID_LOG_TAG "V_ANDROID"
12+
#endif
1113
#endif
12-
#endif
1314

14-
#define V_ANDROID_LOG_TAG_NAME V_ANDROID_LOG_NAME(V_ANDROID_LOG_TAG)
15+
#define V_ANDROID_LOG_TAG_NAME V_ANDROID_LOG_NAME(V_ANDROID_LOG_TAG)
1516

16-
#include <android/log.h>
17-
#define printf(...) __android_log_print(ANDROID_LOG_INFO, V_ANDROID_LOG_TAG_NAME, __VA_ARGS__)
18-
#define fprintf(a, ...) __android_log_print(ANDROID_LOG_ERROR, V_ANDROID_LOG_TAG_NAME, __VA_ARGS__)
17+
#include <android/log.h>
18+
#define printf(...) __android_log_print(ANDROID_LOG_INFO, V_ANDROID_LOG_TAG_NAME, __VA_ARGS__)
19+
#define fprintf(a, ...) __android_log_print(ANDROID_LOG_ERROR, V_ANDROID_LOG_TAG_NAME, __VA_ARGS__)
20+
#endif
1921
#endif

0 commit comments

Comments
 (0)