We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch

jniexport.patch (text/plain), 7.36 KB, created by Dimitris Zenios on 2014-05-05 20:44:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitris Zenios

Created: 2014-05-05 20:44:00 UTC

Size: 7.36 KB

patch

obsolete

># HG changeset patch
># User Dimitris Zenios <dimitris.zenios@gmail.com>
># Date 1399317981 -10800
>#      Mon May 05 22:26:21 2014 +0300
># Node ID 9f6b97b3f13190789d5e4a876464a0fc1b6e9946
># Parent  9785d9cb9618f35e5f0ef148a7f04c25a3e9a764
>Export android jni functions even when build with -fvisibility=hidden flag
>
>diff -r 9785d9cb9618 -r 9f6b97b3f131 src/core/android/SDL_android.c
>--- a/src/core/android/SDL_android.c	Mon May 05 22:21:26 2014 +0300
>+++ b/src/core/android/SDL_android.c	Mon May 05 22:26:21 2014 +0300
>@@ -86,7 +86,7 @@
> *******************************************************************************/
> 
> /* Library init */
>-jint JNI_OnLoad(JavaVM* vm, void* reserved)
>+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved)
> {
>     JNIEnv *env;
>     mJavaVM = vm;
>@@ -108,7 +108,7 @@
> }
> 
> /* Called before SDL_main() to initialize JNI bindings */
>-void SDL_Android_Init(JNIEnv* mEnv, jclass cls)
>+JNIEXPORT void JNICALL SDL_Android_Init(JNIEnv* mEnv, jclass cls)
> {
>     __android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init()");
> 
>@@ -141,7 +141,7 @@
> }
> 
> /* Resize */
>-void Java_org_libsdl_app_SDLActivity_onNativeResize(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeResize(
>                                     JNIEnv* env, jclass jcls,
>                                     jint width, jint height, jint format)
> {
>@@ -149,7 +149,7 @@
> }
> 
> // Paddown
>-int Java_org_libsdl_app_SDLActivity_onNativePadDown(
>+JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadDown(
>                                     JNIEnv* env, jclass jcls,
>                                     jint device_id, jint keycode)
> {
>@@ -157,7 +157,7 @@
> }
> 
> // Padup
>-int Java_org_libsdl_app_SDLActivity_onNativePadUp(
>+JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_onNativePadUp(
>                                    JNIEnv* env, jclass jcls,
>                                    jint device_id, jint keycode)
> {
>@@ -165,7 +165,7 @@
> }
> 
> /* Joy */
>-void Java_org_libsdl_app_SDLActivity_onNativeJoy(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeJoy(
>                                     JNIEnv* env, jclass jcls,
>                                     jint device_id, jint axis, jfloat value)
> {
>@@ -173,7 +173,7 @@
> }
> 
> /* POV Hat */
>-void Java_org_libsdl_app_SDLActivity_onNativeHat(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeHat(
>                                     JNIEnv* env, jclass jcls,
>                                     jint device_id, jint hat_id, jint x, jint y)
> {
>@@ -181,7 +181,7 @@
> }
> 
> 
>-int Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
>+JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
>     JNIEnv* env, jclass jcls,
>     jint device_id, jstring device_name, jint is_accelerometer, 
>     jint nbuttons, jint naxes, jint nhats, jint nballs)
>@@ -196,7 +196,7 @@
>     return retval;
> }
> 
>-int Java_org_libsdl_app_SDLActivity_nativeRemoveJoystick(
>+JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeRemoveJoystick(
>     JNIEnv* env, jclass jcls, jint device_id)
> {
>     return Android_RemoveJoystick(device_id);
>@@ -204,7 +204,7 @@
> 
> 
> /* Surface Created */
>-void Java_org_libsdl_app_SDLActivity_onNativeSurfaceChanged(JNIEnv* env, jclass jcls)
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeSurfaceChanged(JNIEnv* env, jclass jcls)
> {
>     SDL_WindowData *data;
>     SDL_VideoDevice *_this;
>@@ -230,7 +230,7 @@
> }
> 
> /* Surface Destroyed */
>-void Java_org_libsdl_app_SDLActivity_onNativeSurfaceDestroyed(JNIEnv* env, jclass jcls)
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeSurfaceDestroyed(JNIEnv* env, jclass jcls)
> {
>     /* We have to clear the current context and destroy the egl surface here
>      * Otherwise there's BAD_NATIVE_WINDOW errors coming from eglCreateWindowSurface on resume
>@@ -256,27 +256,27 @@
> 
> }
> 
>-void Java_org_libsdl_app_SDLActivity_nativeFlipBuffers(JNIEnv* env, jclass jcls)
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_nativeFlipBuffers(JNIEnv* env, jclass jcls)
> {
>     SDL_GL_SwapWindow(Android_Window);
> }
> 
> /* Keydown */
>-void Java_org_libsdl_app_SDLActivity_onNativeKeyDown(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeKeyDown(
>                                     JNIEnv* env, jclass jcls, jint keycode)
> {
>     Android_OnKeyDown(keycode);
> }
> 
> /* Keyup */
>-void Java_org_libsdl_app_SDLActivity_onNativeKeyUp(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeKeyUp(
>                                     JNIEnv* env, jclass jcls, jint keycode)
> {
>     Android_OnKeyUp(keycode);
> }
> 
> /* Keyboard Focus Lost */
>-void Java_org_libsdl_app_SDLActivity_onNativeKeyboardFocusLost(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeKeyboardFocusLost(
>                                     JNIEnv* env, jclass jcls)
> {
>     /* Calling SDL_StopTextInput will take care of hiding the keyboard and cleaning up the DummyText widget */
>@@ -285,7 +285,7 @@
> 
> 
> /* Touch */
>-void Java_org_libsdl_app_SDLActivity_onNativeTouch(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeTouch(
>                                     JNIEnv* env, jclass jcls,
>                                     jint touch_device_id_in, jint pointer_finger_id_in,
>                                     jint action, jfloat x, jfloat y, jfloat p)
>@@ -294,7 +294,7 @@
> }
> 
> /* Accelerometer */
>-void Java_org_libsdl_app_SDLActivity_onNativeAccel(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeAccel(
>                                     JNIEnv* env, jclass jcls,
>                                     jfloat x, jfloat y, jfloat z)
> {
>@@ -305,14 +305,14 @@
> }
> 
> /* Low memory */
>-void Java_org_libsdl_app_SDLActivity_nativeLowMemory(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_nativeLowMemory(
>                                     JNIEnv* env, jclass cls)
> {
>     SDL_SendAppEvent(SDL_APP_LOWMEMORY);
> }
> 
> /* Quit */
>-void Java_org_libsdl_app_SDLActivity_nativeQuit(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_nativeQuit(
>                                     JNIEnv* env, jclass cls)
> {
>     /* Discard previous events. The user should have handled state storage
>@@ -328,7 +328,7 @@
> }
> 
> /* Pause */
>-void Java_org_libsdl_app_SDLActivity_nativePause(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_nativePause(
>                                     JNIEnv* env, jclass cls)
> {
>     __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativePause()");
>@@ -345,7 +345,7 @@
> }
> 
> /* Resume */
>-void Java_org_libsdl_app_SDLActivity_nativeResume(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_nativeResume(
>                                     JNIEnv* env, jclass cls)
> {
>     __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativeResume()");
>@@ -363,7 +363,7 @@
>     }
> }
> 
>-void Java_org_libsdl_app_SDLInputConnection_nativeCommitText(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLInputConnection_nativeCommitText(
>                                     JNIEnv* env, jclass cls,
>                                     jstring text, jint newCursorPosition)
> {
>@@ -374,7 +374,7 @@
>     (*env)->ReleaseStringUTFChars(env, text, utftext);
> }
> 
>-void Java_org_libsdl_app_SDLInputConnection_nativeSetComposingText(
>+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLInputConnection_nativeSetComposingText(
>                                     JNIEnv* env, jclass cls,
>                                     jstring text, jint newCursorPosition)
> {

Actions: View | Diff

Attachments on bug 2523: 1640

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.