[[ AndroidListeners ]] Add native method for calling back into engine from android listener invoke

livecodeali · livecodeali · commit b40694cb669e · 2017-06-04T11:04:26.000+01:00
diff --git a/engine/engine-sources.gypi b/engine/engine-sources.gypi
@@ -444,6 +444,7 @@
 			'src/mblandroidinput.cpp',
 			'src/mblandroidio.cpp',
 			'src/mblandroidjava.cpp',
+			'src/mblandroidlcb.cpp',
 			'src/mblandroidmail.cpp',
 			'src/mblandroidmediapick.cpp',
 			'src/mblandroidmisc.cpp',
diff --git a/engine/kernel.gyp b/engine/kernel.gyp
@@ -83,12 +83,18 @@
 							'src/mblcamera.cpp',
 						],
 										
-						# Force the entry point to be included in the output
+						
 						'link_settings':
 						{
 							'ldflags':
 							[
-								'-Wl,--undefined,Java_com_runrev_android_Engine_doCreate'
+								# Force the entry point to be included in the output
+								'-Wl,--undefined,Java_com_runrev_android_Engine_doCreate',
+								
+								# mblandroidlcb.cpp contains nothing other than the LCB Invocation Handler 
+								# native callback function, so force the symbol to be included as otherwise it
+								# will be discarded by the linker because nothing in the file is used statically
+								'-Wl,--undefined,Java_com_runrev_android_LCBInvocationHandler_doNativeListenerCallback',
 							],
 						},
 					},
diff --git a/engine/src/mblandroidlcb.cpp b/engine/src/mblandroidlcb.cpp
@@ -0,0 +1,44 @@
+/* Copyright (C) 2017 LiveCode Ltd.
+ 
+ This file is part of LiveCode.
+ 
+ LiveCode is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License v3 as published by the Free
+ Software Foundation.
+ 
+ LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+#include "prefix.h"
+
+#include "globdefs.h"
+#include "filedefs.h"
+#include "objdefs.h"
+#include "parsedef.h"
+
+#include "globals.h"
+#include "object.h"
+#include "mbldc.h"
+
+#include "mblandroid.h"
+#include "mblandroidutil.h"
+
+#include "mblsyntax.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern void MCJavaPrivateDoNativeListenerCallback(jlong p_handler, jstring p_method_name, jobjectArray p_args);
+
+extern "C" JNIEXPORT void JNICALL Java_com_runrev_android_LCBInvocationHandler_doNativeListenerCallback(JNIEnv *env, jobject object, jlong handler, jstring p_method, jobjectArray p_args) __attribute__((visibility("default")));
+
+JNIEXPORT void JNICALL Java_com_runrev_android_LCBInvocationHandler_doNativeListenerCallback(JNIEnv *env, jobject object, jlong p_handler, jstring p_method_name, jobjectArray p_args)
+{
+    MCJavaPrivateDoNativeListenerCallback(p_handler, p_method_name, p_args);
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/libfoundation/src/foundation-java-private.h b/libfoundation/src/foundation-java-private.h
@@ -58,6 +58,7 @@ bool MCJavaPrivateConvertJStringToStringRef(MCJavaObjectRef p_object, MCStringRe
 bool MCJavaPrivateConvertStringRefToJString(MCStringRef p_string, MCJavaObjectRef &r_object);
 bool MCJavaPrivateConvertDataRefToJByteArray(MCDataRef p_string, MCJavaObjectRef &r_object);
 bool MCJavaPrivateConvertJByteArrayToDataRef(MCJavaObjectRef p_object, MCDataRef &r_string);
+
 void* MCJavaPrivateGetMethodId(MCNameRef p_class_name, MCStringRef p_method_name, MCStringRef p_arguments, MCStringRef p_return, int p_call_type);
 void MCJavaPrivateDestroyObject(MCJavaObjectRef p_object);
 bool MCJavaPrivateCheckSignature(MCTypeInfoRef p_signature, MCStringRef p_args, MCStringRef p_return, int p_call_type);
