1
0
Fork 0

Android: rename `initializePathsAndroid()` to `initializePaths()`

merge-requests/1/head
Maksym H 2023-01-05 02:28:43 +02:00
parent 141559689e
commit af36361f42
4 changed files with 4 additions and 9 deletions

View File

@ -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;

View File

@ -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()
{

View File

@ -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");

View File

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