From b05e7c1985bf13a31f79e3bda136471321503aa4 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Wed, 4 Dec 2013 11:55:17 +0800 Subject: [PATCH] Annotate JNICALL with __NDK_FPABI__ In armeabi-v7a, VM still expects JNI functions to follow soft-abi. Annotate it with __NDK_FPABI__ so compiler follows soft-abi in JNI functions regardless the presence of -mhard-float in command-line. It's up to developer to apply JNICALL consistently on JNI functions, ie. those functions whose first arg has type "JNIEnv*" is likely to be Change-Id: Ica7cca8ab9498ce00de6ffc7fff35f8cc13aedbf --- ndk/platforms/android-3/include/jni.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ndk/platforms/android-3/include/jni.h b/ndk/platforms/android-3/include/jni.h index 21ad37030..5a01fff72 100644 --- a/ndk/platforms/android-3/include/jni.h +++ b/ndk/platforms/android-3/include/jni.h @@ -1138,7 +1138,7 @@ jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*); #define JNIIMPORT #define JNIEXPORT __attribute__ ((visibility ("default"))) -#define JNICALL +#define JNICALL __NDK_FPABI__ /* * Prototypes for functions exported by loadable shared libs. These are