asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16669 from akien-mga/fix-apk-expansion

Browse source 
Fix broken APK expansion due to missed option renames
This commit is contained in:
Rémi Verschelde 2018-02-13 22:49:34 +01:00 committed by GitHub
commit 5d80235ead
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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[cll] = "--main_pack";
new_cmdline[cll] = "--main-pack";
new_cmdline[cll + 1] = expansion_pack_path;
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 {
//__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;
}