diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt index 36413e9dcc6..26f19258698 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt @@ -9,12 +9,16 @@ package com.facebook.react.uimanager import com.facebook.common.logging.FLog import com.facebook.react.bridge.NativeArray +import com.facebook.react.bridge.ReactNativeJNISoLoader import com.facebook.react.bridge.ReadableArray import com.facebook.react.bridge.ReadableMap import com.facebook.react.bridge.ReadableType import com.facebook.react.common.ReactConstants public object TransformHelper { + init { + ReactNativeJNISoLoader.staticInit() + } private val helperMatrix: ThreadLocal = object : ThreadLocal() { diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad-common.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad-common.cpp index ef069ed7e41..293d2ffc8ab 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad-common.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad-common.cpp @@ -11,7 +11,6 @@ #include "JReactMarker.h" #include "NativeArray.h" #include "NativeMap.h" -#include "TransformHelper.h" #include "WritableNativeArray.h" #include "WritableNativeMap.h" @@ -28,7 +27,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { ReadableNativeMap::registerNatives(); WritableNativeArray::registerNatives(); WritableNativeMap::registerNatives(); - TransformHelper::registerNatives(); }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp index 309fc5bf700..04ef88c09e9 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp @@ -11,7 +11,7 @@ #include #include "InspectorNetworkRequestListener.h" -#include "JavaScriptExecutorHolder.h" +#include "TransformHelper.h" #ifndef WITH_GLOGINIT #define WITH_GLOGINIT 1 @@ -34,6 +34,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { FLAGS_minloglevel = 0; #endif InspectorNetworkRequestListener::registerNatives(); + TransformHelper::registerNatives(); }); }