diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-02-06 22:43:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-06 22:43:56 +0000 |
| commit | bb80d94e4627935b6400bff1b247c772ea09e9a0 (patch) | |
| tree | 12dd17336d8524973c7788ef3e7d045c8a37edae /9/platforms/android-12/arch-x86/usr/include/jni.h | |
| parent | f57907c0dceaaef200f0fe91145422751ac26654 (diff) | |
| parent | a1ec217d9be90f989de16aaff2584688e374dc3f (diff) | |
| download | prebuilts_ndk-bb80d94e4627935b6400bff1b247c772ea09e9a0.zip prebuilts_ndk-bb80d94e4627935b6400bff1b247c772ea09e9a0.tar.gz prebuilts_ndk-bb80d94e4627935b6400bff1b247c772ea09e9a0.tar.bz2 | |
Merge "Refresh headers to NDK r9c+"
Diffstat (limited to '9/platforms/android-12/arch-x86/usr/include/jni.h')
| -rw-r--r-- | 9/platforms/android-12/arch-x86/usr/include/jni.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/9/platforms/android-12/arch-x86/usr/include/jni.h b/9/platforms/android-12/arch-x86/usr/include/jni.h index 21ad370..f36398f 100644 --- a/9/platforms/android-12/arch-x86/usr/include/jni.h +++ b/9/platforms/android-12/arch-x86/usr/include/jni.h @@ -1138,14 +1138,14 @@ 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 * called by JNI, not provided by JNI. */ -JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved); -JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved); +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved); +JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved); #ifdef __cplusplus } |