Remove unmaintained Android code (fixes #1575)

ddnet · Apr 10, 2019 · 94f3d97 · 94f3d97
1 parent 11127f9
commit 94f3d97
Show file tree

Hide file tree

Showing 25 changed files with 9 additions and 881 deletions.
diff --git a/scripts/AndroidAppSettings.cfg b/scripts/AndroidAppSettings.cfg
diff --git a/scripts/make_android.sh b/scripts/make_android.sh
diff --git a/src/base/detect.h b/src/base/detect.h
@@ -50,11 +50,7 @@
 	#define CONF_FAMILY_UNIX 1
 	#define CONF_FAMILY_STRING "unix"
 	#define CONF_PLATFORM_LINUX 1
-	#if defined(__ANDROID__)
-		#define CONF_PLATFORM_STRING "android"
-	#else
-		#define CONF_PLATFORM_STRING "linux"
-	#endif
+	#define CONF_PLATFORM_STRING "linux"
 #endif
 
 #if defined(__GNU__) || defined(__gnu__)

diff --git a/src/base/system.c b/src/base/system.c
@@ -43,10 +43,6 @@
 		#include <mach/mach_time.h>
 	#endif
 
-	#if defined(__ANDROID__)
-		#include <android/log.h>
-	#endif
-
 #elif defined(CONF_FAMILY_WINDOWS)
 	#define WIN32_LEAN_AND_MEAN
 	#undef _WIN32_WINNT
@@ -145,16 +141,12 @@ void dbg_msg(const char *sys, const char *fmt, ...)
 		loggers[i].logger(str, loggers[i].user);
 }
 
-#if defined(CONF_FAMILY_WINDOWS) || defined(__ANDROID__)
+#if defined(CONF_FAMILY_WINDOWS)
 static void logger_debugger(const char *line, void *user)
 {
 	(void)user;
-#if defined(CONF_FAMILY_WINDOWS)
 	OutputDebugString(line);
 	OutputDebugString("\n");
-#elif defined(__ANDROID__)
-	__android_log_print(ANDROID_LOG_INFO, "DDNet", "%s", line);
-#endif
 }
 #endif
 
@@ -250,7 +242,7 @@ void dbg_logger_stdout()
 
 void dbg_logger_debugger()
 {
-#if defined(CONF_FAMILY_WINDOWS) || defined(__ANDROID__)
+#if defined(CONF_FAMILY_WINDOWS)
 	dbg_logger(logger_debugger, 0, 0);
 #endif
 }