Move InspectorFlags JNI wrapper into devsupport library (facebook#42179)

Summary: Pull Request resolved: facebook#42179 As titled, also moving `InspectorFlags.java` across packages. Changelog: [Internal] Reviewed By: motiz88 Differential Revision: D52367642 fbshipit-source-id: abfd936bf67803a5822f3e938c7ea1ec872a896a
huntie · Jan 10, 2024 · a898f45 · a898f45
1 parent 7f2529d
commit a898f45
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -14,7 +14,6 @@
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.InspectorFlags;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;

diff --git a/...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
@@ -33,7 +33,6 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
 import com.facebook.react.bridge.DefaultJSExceptionHandler;
-import com.facebook.react.bridge.InspectorFlags;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;

diff --git a/...facebook/react/bridge/InspectorFlags.java → ...book/react/devsupport/InspectorFlags.java b/...facebook/react/bridge/InspectorFlags.java → ...book/react/devsupport/InspectorFlags.java
@@ -5,15 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.bridge;
+package com.facebook.react.devsupport;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
-/** fbjni interface for reading `jsinspector_modern::InspectorFlags`. */
+/** JNI wrapper for `jsinspector_modern::InspectorFlags`. */
 @DoNotStrip
 public class InspectorFlags {
   static {
-    ReactBridge.staticInit();
+    DevSupportSoLoader.staticInit();
   }
 
   @DoNotStrip

diff --git a/...rc/main/jni/react/jni/JInspectorFlags.cpp → .../jni/react/devsupport/JInspectorFlags.cpp b/...rc/main/jni/react/jni/JInspectorFlags.cpp → .../jni/react/devsupport/JInspectorFlags.cpp
@@ -9,16 +9,16 @@
 
 #include <jsinspector-modern/InspectorFlags.h>
 
-namespace facebook::react {
+namespace facebook::react::jsinspector_modern {
 
 bool JInspectorFlags::getEnableModernCDPRegistry(jni::alias_ref<jclass>) {
-  auto& inspectorFlags = jsinspector_modern::InspectorFlags::getInstance();
+  auto& inspectorFlags = InspectorFlags::getInstance();
   return inspectorFlags.getEnableModernCDPRegistry();
 }
 
 bool JInspectorFlags::getEnableCxxInspectorPackagerConnection(
     jni::alias_ref<jclass>) {
-  auto& inspectorFlags = jsinspector_modern::InspectorFlags::getInstance();
+  auto& inspectorFlags = InspectorFlags::getInstance();
   return inspectorFlags.getEnableCxxInspectorPackagerConnection();
 }
 
@@ -33,4 +33,4 @@ void JInspectorFlags::registerNatives() {
   });
 }
 
-} // namespace facebook::react
+} // namespace facebook::react::jsinspector_modern
diff --git a/.../src/main/jni/react/jni/JInspectorFlags.h → ...in/jni/react/devsupport/JInspectorFlags.h b/.../src/main/jni/react/jni/JInspectorFlags.h → ...in/jni/react/devsupport/JInspectorFlags.h
@@ -9,15 +9,15 @@
 
 #include <fbjni/fbjni.h>
 
-namespace facebook::react {
+namespace facebook::react::jsinspector_modern {
 
 /**
- * fbjni interface for reading `jsinspector_modern::InspectorFlags`.
+ * JNI wrapper for `jsinspector_modern::InspectorFlags`.
  */
 class JInspectorFlags : public jni::JavaClass<JInspectorFlags> {
  public:
   static constexpr auto kJavaDescriptor =
-      "Lcom/facebook/react/bridge/InspectorFlags;";
+      "Lcom/facebook/react/devsupport/InspectorFlags;";
 
   static bool getEnableModernCDPRegistry(jni::alias_ref<jclass>);
 
@@ -29,4 +29,4 @@ class JInspectorFlags : public jni::JavaClass<JInspectorFlags> {
   JInspectorFlags();
 };
 
-} // namespace facebook::react
+} // namespace facebook::react::jsinspector_modern
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/OnLoad.cpp
@@ -7,6 +7,7 @@
 
 #include "JCxxInspectorPackagerConnection.h"
 #include "JCxxInspectorPackagerConnectionWebSocketDelegate.h"
+#include "JInspectorFlags.h"
 
 #include <fbjni/fbjni.h>
 
@@ -16,5 +17,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
         registerNatives();
     facebook::react::jsinspector_modern::
         JCxxInspectorPackagerConnectionWebSocketDelegate::registerNatives();
+    facebook::react::jsinspector_modern::JInspectorFlags::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
@@ -17,7 +17,6 @@
 #include "CxxModuleWrapperBase.h"
 #include "JCallback.h"
 #include "JInspector.h"
-#include "JInspectorFlags.h"
 #include "JReactMarker.h"
 #include "JavaScriptExecutorHolder.h"
 #include "ProxyExecutor.h"
@@ -85,7 +84,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     WritableNativeMap::registerNatives();
     JReactMarker::registerNatives();
     JInspector::registerNatives();
-    JInspectorFlags::registerNatives();
   });
 }