Fix JNIEXPORT now people are using -fvisibility.
This is a backport from dalvik-dev.
Change-Id: If6001b580bd9b36f3845aaa115333d69682f3a92
diff --git a/include/nativehelper/jni.h b/include/nativehelper/jni.h
index b71cf61..e4d74cf 100644
--- a/include/nativehelper/jni.h
+++ b/include/nativehelper/jni.h
@@ -1116,12 +1116,16 @@
jint JNI_CreateJavaVM(JavaVM**, JNIEnv**, void*);
jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*);
+#define JNIIMPORT
+#define JNIEXPORT __attribute__ ((visibility ("default")))
+#define JNICALL
+
/*
* Prototypes for functions exported by loadable shared libs. These are
* called by JNI, not provided by JNI.
*/
-jint JNI_OnLoad(JavaVM* vm, void* reserved);
-void JNI_OnUnload(JavaVM* vm, void* reserved);
+JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved);
+JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved);
#ifdef __cplusplus
}
@@ -1147,9 +1151,4 @@
#define JNI_COMMIT 1 /* copy content, do not free buffer */
#define JNI_ABORT 2 /* free buffer w/o copying back */
-/* need these for Windows-aware headers */
-#define JNIIMPORT
-#define JNIEXPORT
-#define JNICALL
-
#endif /* JNI_H_ */
