diff options
| author | hurikhan | 2015-01-14 13:31:16 +0800 |
|---|---|---|
| committer | hurikhan | 2015-01-14 13:31:16 +0800 |
| commit | 8a30feebbe676ab922515b58d0deec2f95aa104c (patch) | |
| tree | 55a208d7835022f6b876b4e45d5a482fbd4bd83f /platform/android/java_glue.cpp | |
| parent | 2203ba5fe3f7cdca078dd557ec532b7f335d3670 (diff) | |
| parent | 9012cd408e240d6039120e56fdd47a0983890993 (diff) | |
| download | godot-8a30feebbe676ab922515b58d0deec2f95aa104c.tar.gz godot-8a30feebbe676ab922515b58d0deec2f95aa104c.tar.zst godot-8a30feebbe676ab922515b58d0deec2f95aa104c.zip | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'platform/android/java_glue.cpp')
| -rw-r--r-- | platform/android/java_glue.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 89a9091ba..0312d1364 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -205,6 +205,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) { String name = _get_class_name(env, c, &array); //print_line("name is " + name + ", array "+Variant(array)); + print_line("ARGNAME: "+name); if (name == "java.lang.String") { return String::utf8(env->GetStringUTFChars( (jstring)obj, NULL )); |