Delete JNI_OnLoad

eyr1n · Jul 3, 2023 · 19eec33 · 19eec33
1 parent 20eb386
commit 19eec33
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/rclmodoki/build.gradle b/rclmodoki/build.gradle
@@ -65,7 +65,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'jp.eyrin'
                 artifactId = 'rclmodoki'
-                version = '0.0.1'
+                version = '0.0.2'
             }
         }
     }

diff --git a/rclmodoki/src/main/cpp/include/rclmodoki/rclmodoki.cpp b/rclmodoki/src/main/cpp/include/rclmodoki/rclmodoki.cpp
@@ -65,16 +65,7 @@ jint subscription_get_publisher_count(JNIEnv *env, jobject thiz, jlong subscript
   return subscription->get_publisher_count();
 }
 
-} // namespace rclmodoki
-
-extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-  using namespace rclmodoki;
-
-  JNIEnv *env;
-  if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
-    return JNI_ERR;
-  }
-
+void rclmodoki_init(JNIEnv *env) {
   // Init MessageTypes
   for (auto &message_type : message_types) {
     message_type.second.jni_class = new JNIClass(env, env->FindClass(message_type.first.c_str()));
@@ -111,6 +102,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
   };
   env->RegisterNatives(subscription_class, subscription_methods,
                        sizeof(subscription_methods) / sizeof(JNINativeMethod));
-
-  return JNI_VERSION_1_6;
 }
+
+} // namespace rclmodoki
diff --git a/rclmodoki/src/main/cpp/include/rclmodoki/rclmodoki.hpp b/rclmodoki/src/main/cpp/include/rclmodoki/rclmodoki.hpp
@@ -29,6 +29,8 @@ using MessageTypes = std::unordered_map<std::string, MessageType>;
 
 extern MessageTypes message_types;
 
+void rclmodoki_init(JNIEnv *env);
+
 inline std::string from_jstring(JNIEnv *env, jstring s) {
   const char *s_ = env->GetStringUTFChars(s, nullptr);
   std::string res{s_};