1 files changed, 8 insertions, 7 deletions
diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp
index b5ca604c6e..586ffd0845 100644
--- a/Source/Android/jni/AndroidCommon/IDCache.cpp
+++ b/Source/Android/jni/AndroidCommon/IDCache.cpp
@@ -271,11 +271,9 @@ jmethodID GetBooleanSupplierGet()
 
 }  // namespace IDCache
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
+JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
   s_java_vm = vm;
 
@@ -336,11 +334,13 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
   s_linked_hash_map_init = env->GetMethodID(s_linked_hash_map_class, "<init>", "(I)V");
   s_linked_hash_map_put = env->GetMethodID(
       s_linked_hash_map_class, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+  env->DeleteLocalRef(map_class);
 
   const jclass compress_cb_class =
       env->FindClass("org/dolphinemu/dolphinemu/utils/CompressCallback");
   s_compress_cb_class = reinterpret_cast<jclass>(env->NewGlobalRef(compress_cb_class));
   s_compress_cb_run = env->GetMethodID(s_compress_cb_class, "run", "(Ljava/lang/String;F)Z");
+  env->DeleteLocalRef(compress_cb_class);
 
   const jclass content_handler_class =
       env->FindClass("org/dolphinemu/dolphinemu/utils/ContentHandler");
@@ -358,6 +358,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
   s_content_handler_do_file_search =
       env->GetStaticMethodID(s_content_handler_class, "doFileSearch",
                              "(Ljava/lang/String;[Ljava/lang/String;Z)[Ljava/lang/String;");
+  env->DeleteLocalRef(content_handler_class);
 
   const jclass network_helper_class =
       env->FindClass("org/dolphinemu/dolphinemu/utils/NetworkHelper");
@@ -368,16 +369,18 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
       env->GetStaticMethodID(s_network_helper_class, "GetNetworkPrefixLength", "()I");
   s_network_helper_get_network_gateway =
       env->GetStaticMethodID(s_network_helper_class, "GetNetworkGateway", "()I");
+  env->DeleteLocalRef(network_helper_class);
 
   const jclass boolean_supplier_class =
       env->FindClass("org/dolphinemu/dolphinemu/utils/BooleanSupplier");
   s_boolean_supplier_class = reinterpret_cast<jclass>(env->NewGlobalRef(boolean_supplier_class));
   s_boolean_supplier_get = env->GetMethodID(s_boolean_supplier_class, "get", "()Z");
+  env->DeleteLocalRef(boolean_supplier_class);
 
   return JNI_VERSION;
 }
 
-void JNI_OnUnload(JavaVM* vm, void* reserved)
+JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved)
 {
   JNIEnv* env;
   if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION) != JNI_OK)
@@ -393,8 +396,6 @@ void JNI_OnUnload(JavaVM* vm, void* reserved)
   env->DeleteGlobalRef(s_compress_cb_class);
   env->DeleteGlobalRef(s_content_handler_class);
   env->DeleteGlobalRef(s_network_helper_class);
+  env->DeleteGlobalRef(s_boolean_supplier_class);
 }
-
-#ifdef __cplusplus
 }
-#endif