ANDROID: Create a dedicated define for Android backend

This allows other backends (SDL, libretro) to be used on Android without hacks.
lephilousophe · Aug 31, 2024 · 40e02a8 · 40e02a8
1 parent d47a19e
commit 40e02a8
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 130 deletions.
diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
@@ -50,7 +50,7 @@
 #include "audio/softsynth/emumidi.h"
 #include "gui/message.h"
 #include "backends/fs/fs-factory.h"
-#ifdef __ANDROID__
+#ifdef ANDROID_BACKEND
 #include "backends/fs/android/android-fs-factory.h"
 #endif
 
@@ -340,7 +340,7 @@ int MidiDriver_FluidSynth::open() {
 		return MERR_DEVICE_NOT_AVAILABLE;
 	}
 
-#if defined(__ANDROID__) && defined(FS_HAS_STREAM_SUPPORT)
+#if defined(ANDROID_BACKEND) && defined(FS_HAS_STREAM_SUPPORT)
 	// In Android, when using SAF we need to wrap IO to make it work
 	// We can only do this with FluidSynth 2.0
 	if (!isUsingInMemorySoundFontData &&

diff --git a/backends/fs/android/android-fs-factory.cpp b/backends/fs/android/android-fs-factory.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(__ANDROID__)
-
 #include "backends/platform/android/jni-android.h"
 
 #include "backends/fs/android/android-fs-factory.h"
@@ -131,5 +129,3 @@ bool AndroidFilesystemFactory::Config::isDrive(const Common::String &path) const
 	}
 	return false;
 }
-
-#endif
diff --git a/backends/fs/android/android-posix-fs.cpp b/backends/fs/android/android-posix-fs.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(__ANDROID__)
-
 // For remove()
 #include <stdio.h>
 
@@ -43,5 +41,3 @@ bool AndroidPOSIXFilesystemNode::remove() {
 	setFlags();
 	return true;
 }
-
-#endif
diff --git a/backends/fs/android/android-saf-fs.cpp b/backends/fs/android/android-saf-fs.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(__ANDROID__)
-
 // Allow use of stuff in <time.h> and abort()
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 #define FORBIDDEN_SYMBOL_EXCEPTION_abort
@@ -816,5 +814,3 @@ void AddSAFFakeNode::makeProxySAF() const {
 
 	_proxied = AndroidSAFFilesystemNode::makeFromTree(saftree);
 }
-
-#endif
diff --git a/backends/mutex/pthread/pthread-mutex.cpp b/backends/mutex/pthread/pthread-mutex.cpp
@@ -21,10 +21,6 @@
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
-#include "common/scummsys.h"
-
-#if defined(__ANDROID__) || defined(IPHONE)
-
 #include "backends/mutex/pthread/pthread-mutex.h"
 
 #include <pthread.h>
@@ -82,5 +78,3 @@ bool PthreadMutexInternal::unlock() {
 Common::MutexInternal *createPthreadMutexInternal() {
 	return new PthreadMutexInternal();
 }
-
-#endif
diff --git a/backends/networking/curl/connectionmanager.cpp b/backends/networking/curl/connectionmanager.cpp
@@ -29,7 +29,7 @@
 #include "common/system.h"
 #include "common/timer.h"
 
-#if defined(__ANDROID__)
+#if defined(ANDROID_BACKEND)
 #include "backends/platform/android/jni-android.h"
 #endif
 
@@ -121,7 +121,7 @@ uint32 ConnectionManager::getCloudRequestsPeriodInMicroseconds() {
 }
 
 Common::String ConnectionManager::getCaCertPath() {
-#if defined(__ANDROID__)
+#if defined(ANDROID_BACKEND)
 	// cacert path must exist on filesystem and be reachable by standard open syscall
 	// Lets use ScummVM internal directory
 	Common::String basePath = JNI::getScummVMBasePath();

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(__ANDROID__)
-
 #define FORBIDDEN_SYMBOL_EXCEPTION_getenv(a)
 
 // Allow use of stuff in <time.h>
@@ -1160,5 +1158,3 @@ _s(
 const char * const *OSystem_Android::buildHelpDialogData() {
 	return helpTabs;
 }
-
-#endif
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
@@ -22,8 +22,6 @@
 #ifndef _ANDROID_H_
 #define _ANDROID_H_
 
-#if defined(__ANDROID__)
-
 #include "backends/platform/android/portdefs.h"
 #include "common/fs.h"
 #include "common/archive.h"
@@ -279,4 +277,3 @@ class OSystem_Android : public ModularGraphicsBackend, Common::EventSource {
 };
 
 #endif
-#endif
diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(__ANDROID__)
-
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -162,5 +160,3 @@ Common::SeekableReadStream *AndroidAssetArchive::createReadStreamForMember(const
 	}
 	return new AssetInputStream(_am, path);
 }
-
-#endif
diff --git a/backends/platform/android/asset-archive.h b/backends/platform/android/asset-archive.h
@@ -22,8 +22,6 @@
 #ifndef _ANDROID_ASSET_H_
 #define _ANDROID_ASSET_H_
 
-#if defined(__ANDROID__)
-
 #include <jni.h>
 
 #include "common/str.h"
@@ -50,4 +48,3 @@ class AndroidAssetArchive : public Common::Archive {
 };
 
 #endif
-#endif
diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(__ANDROID__)
-
 // Allow use of stuff in <time.h>
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
@@ -1551,5 +1549,3 @@ void OSystem_Android::setupTouchMode(int oldValue, int newValue) {
 		_touch_pt_scroll.y = -1;
 	}
 }
-
-#endif
diff --git a/backends/platform/android/jni-android.cpp b/backends/platform/android/jni-android.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#if defined(__ANDROID__)
-
 // Allow use of stuff in <time.h> and abort()
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 #define FORBIDDEN_SYMBOL_EXCEPTION_abort
@@ -1127,5 +1125,3 @@ jobject JNI::findSAFTree(const Common::String &name) {
 
 	return tree;
 }
-
-#endif
diff --git a/backends/platform/android/jni-android.h b/backends/platform/android/jni-android.h
@@ -22,8 +22,6 @@
 #ifndef _ANDROID_JNI_H_
 #define _ANDROID_JNI_H_
 
-#if defined(__ANDROID__)
-
 #include <jni.h>
 #include <semaphore.h>
 #include <pthread.h>
@@ -227,4 +225,3 @@ inline int JNI::writeAudio(JNIEnv *env, jbyteArray &data, int offset, int size)
 }
 
 #endif
-#endif
diff --git a/backends/platform/android/snprintf.cpp b/backends/platform/android/snprintf.cpp
@@ -183,8 +183,6 @@
  *
  */
 
-#if defined(__ANDROID__)
-
 // Allow use of stuff in <time.h>
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
@@ -1318,5 +1316,4 @@ static LDOUBLE mypow10(int exponent) {
 	}
 	return result;
 }
-#endif // defined(__ANDROID__)
 /* vim: set joinspaces noexpandtab textwidth=80 cinoptions=(4,u0: */
diff --git a/backends/platform/libretro/jni/Android.mk b/backends/platform/libretro/jni/Android.mk
@@ -15,8 +15,7 @@ include $(ROOT_PATH)/Makefile.common
 
 include $(addprefix $(SCUMMVM_PATH)/, $(addsuffix /module.mk,$(MODULES)))
 
-OBJS_MODULES := $(addprefix $(SCUMMVM_PATH)/, $(foreach MODULE,$(MODULES),$(MODULE_OBJS-$(MODULE)))) \
-	$(CORE_PATH)/android-fs-factory.o
+OBJS_MODULES := $(addprefix $(SCUMMVM_PATH)/, $(foreach MODULE,$(MODULES),$(MODULE_OBJS-$(MODULE))))
 
 #TODO:
 # -O2 or higher causes segmentation fault with some engines (e.g. hopkins)

diff --git a/backends/platform/libretro/src/android-fs-factory.cpp b/backends/platform/libretro/src/android-fs-factory.cpp
diff --git a/base/main.cpp b/base/main.cpp
@@ -92,7 +92,7 @@
 #include "gui/updates-dialog.h"
 #endif
 
-#ifdef __ANDROID__
+#ifdef ANDROID_BACKEND
 #include "backends/fs/android/android-fs-factory.h"
 #endif
 
@@ -618,7 +618,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	}
 #endif
 
-#ifdef __ANDROID__
+#ifdef ANDROID_BACKEND
 	// This early popup message for Android, informing the users about important
 	// changes to file access, needs to be *after* language for the GUI has been selected.
 	// Hence, we instantiate GUI Manager here, to take care of this.

diff --git a/configure b/configure
@@ -4040,6 +4040,7 @@ case $_backend in
 	android)
 		append_var DEFINES "-DREDUCE_MEMORY_USAGE"
 		append_var DEFINES "-DNONSTANDARD_PORT"
+		append_var DEFINES "-DANDROID_BACKEND"
 		append_var INCLUDES '-I$(srcdir)/backends/platform/'$_backend
 		append_var CXXFLAGS "-Wa,--noexecstack"
 		append_var LDFLAGS "-Wl,-z,noexecstack"

diff --git a/gui/launcher.cpp b/gui/launcher.cpp
@@ -660,7 +660,7 @@ bool LauncherDialog::doGameDetection(const Common::Path &path) {
 	Common::FSList files;
 	if (!dir.getChildren(files, Common::FSNode::kListAll)) {
 		Common::U32String msg(_("ScummVM couldn't open the specified directory!"));
-#ifdef __ANDROID__
+#ifdef ANDROID_BACKEND
 		msg += Common::U32String("\n\n");
 		msg += _("Did you add this directory to the SAF? Press the help button [?] on the top for detailed instructions");
 #endif
@@ -684,7 +684,7 @@ bool LauncherDialog::doGameDetection(const Common::Path &path) {
 	if (candidates.empty()) {
 		// No game was found in the specified directory
 		Common::U32String msg(_("ScummVM could not find any game in the specified directory!"));
-#ifdef __ANDROID__
+#ifdef ANDROID_BACKEND
 		msg += Common::U32String("\n\n");
 		msg += _("Did you add this directory to the SAF? Press the help button [?] on the top for detailed instructions");
 #endif