summaryrefslogtreecommitdiffstats
path: root/platform/android/java_glue.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-03-23 20:14:12 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-03-23 20:14:12 -0300
commitefaeebab4d83e5657288b7b20db6ce4ccf987a01 (patch)
tree2c748755605fe2e1bc065519df35f57b49dbf7b4 /platform/android/java_glue.cpp
parentc37fad650f92845a6f59740fea2fea1b46f56db1 (diff)
downloadredot-engine-efaeebab4d83e5657288b7b20db6ce4ccf987a01.tar.gz
Several fixes to Android exporter and port.
Android seems to be working again!
Diffstat (limited to 'platform/android/java_glue.cpp')
-rw-r--r--platform/android/java_glue.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 3229c4c993..7f5893dbdf 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -929,7 +929,16 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, job
static void _initialize_java_modules() {
+ if (!GlobalConfig::get_singleton()->has("android/modules")) {
+ print_line("ANDROID MODULES: Nothing to load, aborting");
+ return;
+ }
+
String modules = GlobalConfig::get_singleton()->get("android/modules");
+ modules = modules.strip_edges();
+ if (modules == String()) {
+ return;
+ }
Vector<String> mods = modules.split(",", false);
print_line("ANDROID MODULES : " + modules);
__android_log_print(ANDROID_LOG_INFO, "godot", "mod count: %i", mods.size());