From 537c28a4221afc31b85296aa45edf714ebd4b91e Mon Sep 17 00:00:00 2001
From: Lulu Wu <luluwu@meta.com>
Date: Wed, 19 Apr 2023 14:52:52 -0700
Subject: [PATCH] Remove @SoLoaderLibrary to avoid OSS breakage (#36821)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/36821

About SoLoaderLibrary:
```
/**
 * This class is used to mark Java classes that depend on native libraries.
 *
 * <p>The purpose is to enable compile-time checking of library renaming. Adding a native target to
 * the native library merge map will cause its library name to change in release builds, which
 * SoLoader only supports if the target sets allow_jni_merging = True.
 *
 * <p>By publishing the library names to Buck via this annotation, we can validate at build time
 * that this parameter is set.
 */
```
This annotation is not supported in OSS so move it to avoid breakage

Changelog:
[Android][Changed] -Remove SoLoaderLibrary to avoid OSS breakage

Reviewed By: cortinico

Differential Revision: D44679498

fbshipit-source-id: 6255e3c5f011d999d5e5aa6ae756a783bea2ee77
---
 .../java/com/facebook/react/bridgeless/JSTimerExecutor.java     | 2 --
 .../main/java/com/facebook/react/bridgeless/ReactInstance.java  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSTimerExecutor.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSTimerExecutor.java
index aa29cc707e8..5dbfd5b215f 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSTimerExecutor.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSTimerExecutor.java
@@ -14,10 +14,8 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.modules.core.JavaScriptTimerExecutor;
 import com.facebook.soloader.SoLoader;
-import com.facebook.soloader.annotation.SoLoaderLibrary;
 
 @Nullsafe(Nullsafe.Mode.LOCAL)
-@SoLoaderLibrary("rninstance")
 public class JSTimerExecutor implements JavaScriptTimerExecutor {
 
   static {
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java
index 0a093a01b9a..72afdba4470 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java
@@ -54,7 +54,6 @@ import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.uimanager.ViewManagerResolver;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.soloader.SoLoader;
-import com.facebook.soloader.annotation.SoLoaderLibrary;
 import com.facebook.systrace.Systrace;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -69,7 +68,6 @@ import javax.annotation.Nullable;
  */
 @Nullsafe(Nullsafe.Mode.LOCAL)
 @ThreadSafe
-@SoLoaderLibrary({"rninstance"})
 public final class ReactInstance {
 
   private static final String TAG = ReactInstance.class.getSimpleName();