Removed obsolete Android-specific parts

BlitterStudio · Dec 10, 2023 · c02d2ce · c02d2ce
1 parent d0fd7fd
commit c02d2ce
Show file tree

Hide file tree

Showing 23 changed files with 9 additions and 446 deletions.
diff --git a/Android.mk b/Android.mk
diff --git a/external/libguisan/Android.mk b/external/libguisan/Android.mk
diff --git a/src/fsusage.cpp b/src/fsusage.cpp
@@ -18,7 +18,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 
 #ifdef HAVE_SYS_STAT_H
@@ -294,15 +294,9 @@ int get_fs_usage (const TCHAR *path, const TCHAR *disk, struct fs_usage *fsp)
 #ifdef STAT_STATVFS		/* SVR4 */
 # define CONVERT_BLOCKS(B) \
 	adjust_blocks ((B), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512)
-#ifdef ANDROID
-	struct statfs fsd;
 
-	if (statfs (path, &fsd) < 0)
-#else
 	struct statvfs fsd{};
-
 	if (statvfs (path, &fsd) < 0)
-#endif
 		return -1;
 	/* f_frsize isn't guaranteed to be supported.  */
 

diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
@@ -15,10 +15,7 @@
 #include <csignal>
 
 #include <algorithm>
-#ifndef ANDROID
 #include <execinfo.h>
-#endif
-
 #include "sysdeps.h"
 #include "options.h"
 #include "audio.h"
@@ -4031,7 +4028,7 @@ int main(int argc, char* argv[])
 	ClearAvailableROMList();
 	romlist_clear();
 	free_keyring();
-	//free_AmigaMem();
+
 	lstMRUDiskList.clear();
 	lstMRUCDList.clear();
 	lstMRUWhdloadList.clear();

diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp
@@ -90,10 +90,6 @@ SDL_Rect renderQuad;
 static int dx = 0, dy = 0;
 const char* sdl_video_driver;
 
-#ifdef ANDROID
-#include <android/log.h>
-#endif
-
 static int display_width;
 static int display_height;
 static int display_depth;

diff --git a/src/osdep/amiberry_mem.cpp b/src/osdep/amiberry_mem.cpp
@@ -20,10 +20,6 @@
 #include "sys/sysinfo.h"
 #endif
 
-#ifdef ANDROID
-#define valloc(x) memalign(getpagesize(), x)
-#endif
-
 #ifdef __APPLE__
 #include <sys/sysctl.h>
 #endif