fix: Load native part of NitroImage in shared OnLoad.kt file

mrousavy · mrousavy · commit aa19ec7199c6 · 2025-01-15T19:35:12.000+01:00
diff --git a/packages/nitrogen/src/autolinking/android/createHybridObjectInitializer.ts b/packages/nitrogen/src/autolinking/android/createHybridObjectInitializer.ts
@@ -13,6 +13,8 @@ import { getBuildingWithGeneratedCmakeDefinition } from './createCMakeExtension.
 
 export function createHybridObjectIntializer(): SourceFile[] {
   const cxxNamespace = NitroConfig.getCxxNamespace('c++')
+  const cppLibName = NitroConfig.getAndroidCxxLibName()
+  const javaNamespace = NitroConfig.getAndroidPackage('java/kotlin')
   const autolinkingClassName = `${NitroConfig.getAndroidCxxLibName()}OnLoad`
 
   const jniRegistrations = getJNINativeRegistrations().map(
@@ -64,7 +66,7 @@ ${createFileMetadataString(`${autolinkingClassName}.hpp`)}
 namespace ${cxxNamespace} {
 
   /**
-   * Initializes the native (C++) part of ${NitroConfig.getAndroidCxxLibName()}, and autolinks all Hybrid Objects.
+   * Initializes the native (C++) part of ${cppLibName}, and autolinks all Hybrid Objects.
    * Call this in your \`JNI_OnLoad\` function (probably inside \`cpp-adapter.cpp\`).
    * Example:
    * \`\`\`cpp (cpp-adapter.cpp)
@@ -110,7 +112,39 @@ int initialize(JavaVM* vm) {
 }
 
 } // namespace ${cxxNamespace}
+  `.trim()
 
+  const kotlinCode = `
+${createFileMetadataString(`${autolinkingClassName}.kt`)}
+
+package ${javaNamespace}
+
+import android.util.Log
+
+internal class ${autolinkingClassName} {
+  companion object {
+    private const val TAG = "${autolinkingClassName}"
+    private var didLoad = false
+    /**
+     * Initializes the native part of "${cppLibName}".
+     * This method is idempotent and can be called more than once.
+     */
+    @JvmStatic
+    fun initializeNative() {
+      if (didLoad) return
+      try {
+        Log.i(TAG, "Loading ${cppLibName} C++ library...")
+        System.loadLibrary("${cppLibName}")
+        Log.i(TAG, "Successfully loaded ${cppLibName} C++ library!")
+        didLoad = true
+      } catch (e: Error) {
+        Log.e(TAG, "Failed to load ${cppLibName} C++ library! Is it properly installed and linked? " +
+                    "Is the name correct? (see \`CMakeLists.txt\`, at \`add_library(...)\`)", e)
+        throw e
+      }
+    }
+  }
+}
   `.trim()
 
   return [
@@ -128,5 +162,12 @@ int initialize(JavaVM* vm) {
       platform: 'android',
       subdirectory: [],
     },
+    {
+      content: kotlinCode,
+      language: 'kotlin',
+      name: `${autolinkingClassName}.kt`,
+      platform: 'android',
+      subdirectory: ['kotlin', ...javaNamespace.split('.')],
+    },
   ]
 }
diff --git a/packages/nitrogen/src/syntax/kotlin/KotlinHybridObject.ts b/packages/nitrogen/src/syntax/kotlin/KotlinHybridObject.ts
@@ -21,7 +21,6 @@ export function createKotlinHybridObject(spec: HybridObjectSpec): SourceFile[] {
     .join('\n\n')
 
   const javaPackage = NitroConfig.getAndroidPackage('java/kotlin')
-  const cppLibName = NitroConfig.getAndroidCxxLibName()
 
   let kotlinBase = spec.isHybridView ? 'HybridView' : 'HybridObject'
   if (spec.baseTypes.length > 0) {
@@ -91,17 +90,6 @@ abstract class ${name.HybridTSpec}: ${kotlinBase}() {
 
   companion object {
     private const val TAG = "${name.HybridTSpec}"
-    init {
-      try {
-        Log.i(TAG, "Loading ${cppLibName} C++ library...")
-        System.loadLibrary("${cppLibName}")
-        Log.i(TAG, "Successfully loaded ${cppLibName} C++ library!")
-      } catch (e: Error) {
-        Log.e(TAG, "Failed to load ${cppLibName} C++ library! Is it properly installed and linked? " +
-                    "Is the name correct? (see \`CMakeLists.txt\`, at \`add_library(...)\`)", e)
-        throw e
-      }
-    }
   }
 }
   `.trim()
diff --git a/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroImagePackage.java b/packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/NitroImagePackage.java
@@ -29,6 +29,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
   }
 
   static {
-    System.loadLibrary("NitroImage");
+    NitroImageOnLoad.initializeNative();
   }
 }
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridBaseSpec.kt b/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridBaseSpec.kt
@@ -54,16 +54,5 @@ abstract class HybridBaseSpec: HybridObject() {
 
   companion object {
     private const val TAG = "HybridBaseSpec"
-    init {
-      try {
-        Log.i(TAG, "Loading NitroImage C++ library...")
-        System.loadLibrary("NitroImage")
-        Log.i(TAG, "Successfully loaded NitroImage C++ library!")
-      } catch (e: Error) {
-        Log.e(TAG, "Failed to load NitroImage C++ library! Is it properly installed and linked? " +
-                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
-        throw e
-      }
-    }
   }
 }
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridChildSpec.kt b/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridChildSpec.kt
@@ -54,16 +54,5 @@ abstract class HybridChildSpec: HybridBaseSpec() {
 
   companion object {
     private const val TAG = "HybridChildSpec"
-    init {
-      try {
-        Log.i(TAG, "Loading NitroImage C++ library...")
-        System.loadLibrary("NitroImage")
-        Log.i(TAG, "Successfully loaded NitroImage C++ library!")
-      } catch (e: Error) {
-        Log.e(TAG, "Failed to load NitroImage C++ library! Is it properly installed and linked? " +
-                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
-        throw e
-      }
-    }
   }
 }
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridImageFactorySpec.kt b/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridImageFactorySpec.kt
@@ -66,16 +66,5 @@ abstract class HybridImageFactorySpec: HybridObject() {
 
   companion object {
     private const val TAG = "HybridImageFactorySpec"
-    init {
-      try {
-        Log.i(TAG, "Loading NitroImage C++ library...")
-        System.loadLibrary("NitroImage")
-        Log.i(TAG, "Successfully loaded NitroImage C++ library!")
-      } catch (e: Error) {
-        Log.e(TAG, "Failed to load NitroImage C++ library! Is it properly installed and linked? " +
-                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
-        throw e
-      }
-    }
   }
 }
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridImageSpec.kt b/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridImageSpec.kt
@@ -75,16 +75,5 @@ abstract class HybridImageSpec: HybridObject() {
 
   companion object {
     private const val TAG = "HybridImageSpec"
-    init {
-      try {
-        Log.i(TAG, "Loading NitroImage C++ library...")
-        System.loadLibrary("NitroImage")
-        Log.i(TAG, "Successfully loaded NitroImage C++ library!")
-      } catch (e: Error) {
-        Log.e(TAG, "Failed to load NitroImage C++ library! Is it properly installed and linked? " +
-                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
-        throw e
-      }
-    }
   }
 }
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridTestObjectSwiftKotlinSpec.kt b/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridTestObjectSwiftKotlinSpec.kt
@@ -389,16 +389,5 @@ abstract class HybridTestObjectSwiftKotlinSpec: HybridObject() {
 
   companion object {
     private const val TAG = "HybridTestObjectSwiftKotlinSpec"
-    init {
-      try {
-        Log.i(TAG, "Loading NitroImage C++ library...")
-        System.loadLibrary("NitroImage")
-        Log.i(TAG, "Successfully loaded NitroImage C++ library!")
-      } catch (e: Error) {
-        Log.e(TAG, "Failed to load NitroImage C++ library! Is it properly installed and linked? " +
-                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
-        throw e
-      }
-    }
   }
 }
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridTestViewSpec.kt b/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/HybridTestViewSpec.kt
@@ -73,16 +73,5 @@ abstract class HybridTestViewSpec: HybridView() {
 
   companion object {
     private const val TAG = "HybridTestViewSpec"
-    init {
-      try {
-        Log.i(TAG, "Loading NitroImage C++ library...")
-        System.loadLibrary("NitroImage")
-        Log.i(TAG, "Successfully loaded NitroImage C++ library!")
-      } catch (e: Error) {
-        Log.e(TAG, "Failed to load NitroImage C++ library! Is it properly installed and linked? " +
-                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
-        throw e
-      }
-    }
   }
 }
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/NitroImageOnLoad.kt b/packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/NitroImageOnLoad.kt
@@ -0,0 +1,35 @@
+///
+/// NitroImageOnLoad.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+package com.margelo.nitro.image
+
+import android.util.Log
+
+internal class NitroImageOnLoad {
+  companion object {
+    private const val TAG = "NitroImageOnLoad"
+    private var didLoad = false
+    /**
+     * Initializes the native part of "NitroImage".
+     * This method is idempotent and can be called more than once.
+     */
+    @JvmStatic
+    fun initializeNative() {
+      if (didLoad) return
+      try {
+        Log.i(TAG, "Loading NitroImage C++ library...")
+        System.loadLibrary("NitroImage")
+        Log.i(TAG, "Successfully loaded NitroImage C++ library!")
+        didLoad = true
+      } catch (e: Error) {
+        Log.e(TAG, "Failed to load NitroImage C++ library! Is it properly installed and linked? " +
+                    "Is the name correct? (see `CMakeLists.txt`, at `add_library(...)`)", e)
+        throw e
+      }
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`static {`
`32`		`- System.loadLibrary("NitroImage");`
	`32`	`+ NitroImageOnLoad.initializeNative();`
`33`	`33`	`}`
`34`	`34`	`}`