From 49f6ffc92f56953b68f340783e326145a377c3b0 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Thu, 25 Jan 2024 07:07:04 -0800 Subject: [PATCH] Fix Soloader call in DefaultComponentsRegistry (#42660) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/42660 Calling `maybeLoadSoLibrary` from init is too late, as we call `initHybrid` before `init`. Instead use a static initializer. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D53048065 fbshipit-source-id: dfd2957fd9209e02c498ee08e9cbd7c7a1a83c3e --- .../react/defaults/DefaultComponentsRegistry.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt index 2cf0b6908e4..260f46ec5b4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt @@ -23,15 +23,17 @@ class DefaultComponentsRegistry @DoNotStrip private constructor(componentFactory: ComponentFactory) { - @DoNotStrip private val hybridData: HybridData = initHybrid(componentFactory) + @DoNotStrip + @Suppress("NoHungarianNotation") + private val mHybridData: HybridData = initHybrid(componentFactory) @DoNotStrip private external fun initHybrid(componentFactory: ComponentFactory): HybridData - init { - DefaultSoLoader.maybeLoadSoLibrary() - } - companion object { + init { + DefaultSoLoader.maybeLoadSoLibrary() + } + @JvmStatic @DoNotStrip fun register(componentFactory: ComponentFactory) = DefaultComponentsRegistry(componentFactory)