diff options
| author | Rémi Verschelde | 2018-02-13 22:41:19 +0100 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-02-19 22:19:08 +0100 |
| commit | fd033473c7e7b3e10f5bc1e9745336de53a98bca (patch) | |
| tree | 70a6b85b7ab279b31ee657fccd93b655fa86e44e /platform/android | |
| parent | a39930c5b909fa0794af65a9127ebfa668a31bb9 (diff) | |
| download | godot-fd033473c7e7b3e10f5bc1e9745336de53a98bca.tar.gz godot-fd033473c7e7b3e10f5bc1e9745336de53a98bca.tar.zst godot-fd033473c7e7b3e10f5bc1e9745336de53a98bca.zip | |
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 e3658a6464b4473b7cca1d41f9315cd6bfd255d4)
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/java/src/org/godotengine/godot/Godot.java | 2 | ||||
| -rw-r--r-- | platform/android/java_glue.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/java/src/org/godotengine/godot/Godot.java b/platform/android/java/src/org/godotengine/godot/Godot.java index b5b0afb9e..0d14211bd 100644 --- a/platform/android/java/src/org/godotengine/godot/Godot.java +++ b/platform/android/java/src/org/godotengine/godot/Godot.java @@ -404,7 +404,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC new_cmdline = new String[2]; } - new_cmdline[cll] = "--main_pack"; + new_cmdline[cll] = "--main-pack"; new_cmdline[cll + 1] = expansion_pack_path; command_line = new_cmdline; } diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 4e9e4f626..2d81d79bf 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -926,7 +926,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jo } else { //__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; } |