gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-21 03:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5390 from volzhs/jni-stringarray

Browse source 
Fix string array parameter check with jni
This commit is contained in:
Rémi Verschelde 2016-06-26 09:45:36 +02:00 committed by GitHub
parent b02d67be30 456b7733fc
commit fad6b29a59
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/android/godot_android.cpp
View file

@ -910,7 +910,7 @@ static Variant::Type get_jni_type(const String& p_type) {
{"java.lang.String",Variant::STRING},
{"[I",Variant::INT_ARRAY},
{"[F",Variant::REAL_ARRAY},
{"[java.lang.String",Variant::STRING_ARRAY},
{"[Ljava.lang.String;",Variant::STRING_ARRAY},
{NULL,Variant::NIL}
};
@ -941,7 +941,7 @@ static const char* get_jni_sig(const String& p_type) {
{"java.lang.String","Ljava/lang/String;"},
{"[I","[I"},
{"[F","[F"},
{"[java.lang.String","[Ljava/lang/String;"},
{"[Ljava.lang.String;","[Ljava/lang/String;"},
{NULL,"V"}
};

4
platform/android/java_glue.cpp
View file

@ -1563,7 +1563,7 @@ static Variant::Type get_jni_type(const String& p_type) {
{"[I",Variant::INT_ARRAY},
{"[B",Variant::RAW_ARRAY},
{"[F",Variant::REAL_ARRAY},
{"[java.lang.String",Variant::STRING_ARRAY},
{"[Ljava.lang.String;",Variant::STRING_ARRAY},
{"org.godotengine.godot.Dictionary", Variant::DICTIONARY},
{NULL,Variant::NIL}
};
@ -1599,7 +1599,7 @@ static const char* get_jni_sig(const String& p_type) {
{"[I","[I"},
{"[B","[B"},
{"[F","[F"},
{"[java.lang.String","[Ljava/lang/String;"},
{"[Ljava.lang.String;","[Ljava/lang/String;"},
{NULL,"V"}
};