godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken APK expansion due to missed option renames 

Command line options were refactored for 3.0 to follow the common usage
of double-dashed long options, but `--main-pack` went through the cracks.

Fixes #16533.

(cherry picked from commit e3658a6464)
This commit is contained in:
Rémi Verschelde 2018-02-13 22:41:19 +01:00 committed by Hein-Pieter van Braam
parent a39930c5b9
commit fd033473c7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/java/src/org/godotengine/godot/Godot.java
View File

@ -404,7 +404,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
new_cmdline = new String[2]; new_cmdline = new String[2];
} }
new_cmdline[cll] = "--main_pack"; new_cmdline[cll] = "--main-pack";
new_cmdline[cll + 1] = expansion_pack_path; new_cmdline[cll + 1] = expansion_pack_path;
command_line = new_cmdline; command_line = new_cmdline;
} }

2
platform/android/java_glue.cpp
View File

@ -926,7 +926,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jo
} else { } else {
//__android_log_print(ANDROID_LOG_INFO,"godot","cmdline arg %i is: %s\n",i,rawString); //__android_log_print(ANDROID_LOG_INFO,"godot","cmdline arg %i is: %s\n",i,rawString);
if (strcmp(rawString, "-main_pack") == 0) if (strcmp(rawString, "--main-pack") == 0)
use_apk_expansion = true; use_apk_expansion = true;
} }