kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parse JNI class names more intelligently.

Browse Source
This commit is contained in:
Joseph Cloutier
2022-06-07 12:05:50 -04:00
parent 238428c7ea
commit 14671facef
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lime/system/JNI.hx
View File

@@ -3,6 +3,8 @@ package lime.system;
#if (!lime_doc_gen || android) #if (!lime_doc_gen || android)
import lime._internal.backend.native.NativeCFFI; import lime._internal.backend.native.NativeCFFI;
using StringTools;
/** /**
The Java Native Interface (JNI) allows C++ code to call Java functions, and The Java Native Interface (JNI) allows C++ code to call Java functions, and
vice versa. On Android, Haxe code compiles to C++, but only Java code can vice versa. On Android, Haxe code compiles to C++, but only Java code can
@@ -31,6 +33,19 @@ class JNI
private static var alreadyCreated = new Map<String, Bool>(); private static var alreadyCreated = new Map<String, Bool>();
private static var initialized = false; private static var initialized = false;
private static function transformClassName(className:String):String
{
var parts:Array<String> = className.split(".");
if (parts.length <= 1)
return className;
var nestedClassName:String = "";
if (~/^[A-Z]/.match(parts[parts.length - 2]))
nestedClassName = "$" + parts.pop();
return parts.join("/") + nestedClassName;
}
public static function callMember(method:Dynamic, jobject:Dynamic, a:Array<Dynamic>):Dynamic public static function callMember(method:Dynamic, jobject:Dynamic, a:Array<Dynamic>):Dynamic
{ {
switch (a.length) switch (a.length)
@@ -86,6 +101,7 @@ class JNI
init(); init();
#if (android && lime_cffi && !macro) #if (android && lime_cffi && !macro)
className = transformClassName(className);
return new JNIMemberField(NativeCFFI.lime_jni_create_field(className, memberName, signature, false)); return new JNIMemberField(NativeCFFI.lime_jni_create_field(className, memberName, signature, false));
#else #else
return null; return null;
@@ -97,7 +113,7 @@ class JNI
init(); init();
#if (android && lime_cffi && !macro) #if (android && lime_cffi && !macro)
className = className.split(".").join("/"); className = transformClassName(className);
var handle = NativeCFFI.lime_jni_create_method(className, memberName, signature, false, quietFail); var handle = NativeCFFI.lime_jni_create_method(className, memberName, signature, false, quietFail);
if (handle == null) if (handle == null)
@@ -122,6 +138,7 @@ class JNI
init(); init();
#if (android && lime_cffi && !macro) #if (android && lime_cffi && !macro)
className = transformClassName(className);
return new JNIStaticField(NativeCFFI.lime_jni_create_field(className, memberName, signature, true)); return new JNIStaticField(NativeCFFI.lime_jni_create_field(className, memberName, signature, true));
#else #else
return null; return null;
@@ -133,7 +150,7 @@ class JNI
init(); init();
#if (android && lime_cffi && !macro) #if (android && lime_cffi && !macro)
className = className.split(".").join("/"); className = transformClassName(className);
var handle = NativeCFFI.lime_jni_create_method(className, memberName, signature, true, quietFail); var handle = NativeCFFI.lime_jni_create_method(className, memberName, signature, true, quietFail);
if (handle == null) if (handle == null)