diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-07 23:06:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-07 23:06:05 +0100 |
commit | 201cb8d7ed8134eb21d41189025b8619557b7e1d (patch) | |
tree | 604a1634c83ad4c209dc33176e0f218b52f3ef2d /platform | |
parent | 6ee30022370202c08a7743d6efb8ca010786cc4f (diff) | |
parent | c74bf2e6b1ccad9c6cf72c0b142aa924de67eed0 (diff) |
Merge pull request #26745 from akien-mga/android-modules-def
Define android/modules globally so it appears in Project Settings
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/java_glue.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 7adfec0ebb..dd60e96923 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -833,7 +833,6 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *en static void _initialize_java_modules() { if (!ProjectSettings::get_singleton()->has_setting("android/modules")) { - print_line("Android modules: Nothing to load, aborting"); return; } @@ -853,19 +852,16 @@ static void _initialize_java_modules() { jmethodID getClassLoader = env->GetMethodID(activityClass, "getClassLoader", "()Ljava/lang/ClassLoader;"); jobject cls = env->CallObjectMethod(_godot_instance, getClassLoader); - //cls=env->NewGlobalRef(cls); jclass classLoader = env->FindClass("java/lang/ClassLoader"); - //classLoader=(jclass)env->NewGlobalRef(classLoader); jmethodID findClass = env->GetMethodID(classLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;"); for (int i = 0; i < mods.size(); i++) { String m = mods[i]; - //jclass singletonClass = env->FindClass(m.utf8().get_data()); - print_line("Loading module: " + m); + print_line("Loading Android module: " + m); jstring strClassName = env->NewStringUTF(m.utf8().get_data()); jclass singletonClass = (jclass)env->CallObjectMethod(cls, findClass, strClassName); @@ -874,7 +870,6 @@ static void _initialize_java_modules() { ERR_EXPLAIN("Couldn't find singleton for class: " + m); ERR_CONTINUE(!singletonClass); } - //singletonClass=(jclass)env->NewGlobalRef(singletonClass); jmethodID initialize = env->GetStaticMethodID(singletonClass, "initialize", "(Landroid/app/Activity;)Lorg/godotengine/godot/Godot$SingletonBase;"); @@ -1577,7 +1572,3 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv * // something env->PopLocalFrame(NULL); } - -//Main::cleanup(); - -//return os.get_exit_code(); |