From c03b7dd772803484f18c08d6bfe5bd7837e4b541 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Mon, 10 Aug 2020 18:40:26 -0700
Subject: [PATCH] Fix NoSuchMethodError in CoreComponentsRegistry class

Summary:
This diff fixes a NoSuchMethodError in CoreComponentsRegistry class.

changelog: [internal] internal

Reviewed By: JoshuaGross

Differential Revision: D23043627

fbshipit-source-id: bd87ba560cc57ca345bf694b457be09097c433fe
---
 .../com/facebook/react/fabric/ComponentFactory.java    |  1 +
 .../facebook/react/fabric/CoreComponentsRegistry.java  | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactory.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactory.java
index 3af759d0f3..de377f4af0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactory.java
@@ -23,6 +23,7 @@ public class ComponentFactory {
   @DoNotStrip
   private static native HybridData initHybrid();
 
+  @DoNotStrip
   public ComponentFactory() {
     mHybridData = initHybrid();
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java
index 288ded2d56..66461d37ca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java
@@ -7,19 +7,25 @@
 
 package com.facebook.react.fabric;
 
+import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 
 @DoNotStrip
 public class CoreComponentsRegistry extends ComponentRegistry {
+
   static {
-    SoLoader.loadLibrary("fabricjni");
+    FabricSoLoader.staticInit();
   }
 
+  @DoNotStrip
+  private static native HybridData initHybrid();
+
+  @DoNotStrip
   private CoreComponentsRegistry(ComponentFactory componentFactory) {
     super(componentFactory);
   }
 
+  @DoNotStrip
   public static CoreComponentsRegistry register(ComponentFactory componentFactory) {
     return new CoreComponentsRegistry(componentFactory);
   }