Android: rename initializePathsAndroid() to initializePaths()

src/main.cpp

@@ -160,13 +160,8 @@ int main(int argc, char *argv[])
 
 #ifdef __ANDROID__
 	porting::initAndroid();
-	porting::initializePathsAndroid();
-#elif defined(__IOS__)
-	porting::initializePathsiOS();
-	porting::copyAssets();
-#else
-	porting::initializePaths();
 #endif
+	porting::initializePaths();
 
 	if (!create_userdata_path()) {
 		errorstream << "Cannot create user data directory" << std::endl;

src/porting.cpp

@@ -520,6 +520,7 @@ bool setSystemPaths()
 
 #endif
 
+#if !defined(__ANDROID__) && !defined(__IOS__)
 void initializePaths()
 {
 #if RUN_IN_PLACE
@@ -623,7 +624,6 @@ void initializePaths()
 #endif  // USE_GETTEXT
 }
 
-#if !defined(__ANDROID__) && !defined(__IOS__)
 // Dummy for other OS
 bool hasRealKeyboard()
 {

src/porting_android.cpp

@@ -190,7 +190,7 @@ static std::string getAndroidPath(
 	return javaStringToUTF8(js_path);
 }
 
-void initializePathsAndroid()
+void initializePaths()
 {
 	// Get Environment class
 	jclass cls_Env = jnienv->FindClass("android/os/Environment");

src/porting_android.h

@@ -42,7 +42,7 @@ void cleanupAndroid();
 /**
  * Initializes path_* variables for Android
  */
-void initializePathsAndroid();
+void initializePaths();
 
 /**
  * show text input dialog in java