Android: properly setup our paths <HOME>, <DATA> and <BUNDLE>.

Since on Android our flx files are always bundled in the APK we can safely assume that it exists.

Author: DominusExult

exult.cc

@@ -123,8 +123,6 @@ using namespace Pentagram;
 #	include "ios_utils.h"
 #elif defined(ANDROID)
 #	include "TouchUI_Android.h"
-
-#	include <SDL_system.h>
 #endif
 
 using std::atexit;
@@ -296,12 +294,6 @@ int main(int argc, char* argv[]) {
 				return std::make_unique<SdlRwopsOstream>(s, mode);
 			});
 
-#ifdef ANDROID
-	// Doing this ifdef here rather than in utils.cc so that it doesn't have to
-	// take a dependency on SDL.
-	U7set_home(SDL_AndroidGetInternalStoragePath());
-#endif
-
 	// Declare everything from the commandline that we're interested in.
 	parameters.declare("-h", &needhelp, true);
 	parameters.declare("--help", &needhelp, true);

files/utils.cc

@@ -751,11 +751,16 @@ string Get_home() {
 		}
 	}
 #	endif    // PORTABLE_WIN32_EXULT
-#else
+#else 
+#	ifdef ANDROID
+	const char *home = SDL_AndroidGetInternalStoragePath();
+	home_directory = home;
+#	else
 	const char* home = nullptr;
 	if ((home = getenv("HOME")) != nullptr) {
 		home_directory = home;
 	}
+#	endif
 #endif
 	return home_directory;
 }
@@ -824,6 +829,16 @@ void setup_data_dir(const std::string& data_path, const char* runpath) {
 		return;
 	}
 #endif
+#ifdef ANDROID
+	// We always have the APK with the bundled flx files
+	add_system_path("<BUNDLE>", "data");
+	// for optional data use the InternalStoragePath data folder
+	const char *androidpath = SDL_AndroidGetInternalStoragePath();
+	string path(androidpath);
+	path += "/data";
+	add_system_path("<DATA>", path);
+	return;
+#endif
 
 	// First, try the cfg value:
 	add_system_path("<DATA>", data_path);