From fd033473c7e7b3e10f5bc1e9745336de53a98bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 13 Feb 2018 22:41:19 +0100 Subject: [PATCH] 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) --- platform/android/java/src/org/godotengine/godot/Godot.java | 2 +- 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 b5b0afb9e0e..0d14211bd06 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 4e9e4f62606..2d81d79bf10 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; }