From 957a1977b31b49cd1240f3f40e012dc3cec9d271 Mon Sep 17 00:00:00 2001
From: Alex Hunt <huntie@meta.com>
Date: Wed, 13 Dec 2023 03:37:32 -0800
Subject: [PATCH] Drop WITH_INSPECTOR build flag (#41911)

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

Follow-up to D52040150.

Changelog: [Internal]

Reviewed By: motiz88

Differential Revision: D52072475

fbshipit-source-id: d028ca4c5282c4c061af08be5d7e63f1c3d9bdcb
---
 .../cmake-utils/ReactNative-application.cmake          |  1 -
 .../ReactAndroid/src/main/jni/react/jni/CMakeLists.txt |  3 +--
 .../ReactAndroid/src/main/jni/react/jni/JInspector.cpp |  4 ----
 .../ReactAndroid/src/main/jni/react/jni/JInspector.h   |  4 ----
 .../ReactAndroid/src/main/jni/react/jni/OnLoad.cpp     | 10 ++--------
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
index 964e76f3753..13bba97da63 100644
--- a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
+++ b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
@@ -58,7 +58,6 @@ target_compile_options(${CMAKE_PROJECT_NAME}
                 -fexceptions
                 -frtti
                 -std=c++20
-                -DWITH_INSPECTOR=1
                 -DLOG_TAG=\"ReactNative\")
 
 # Prefab packages from React Native
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
index 13f248431da..aa56434fc8d 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
@@ -11,8 +11,7 @@ file(GLOB reactnativejni_SRC CONFIGURE_DEPENDS *.cpp)
 add_compile_options(
         -fexceptions
         -Wno-unused-lambda-capture
-        -std=c++20
-        -DWITH_INSPECTOR=1)
+        -std=c++20)
 
 ######################
 ### reactnativejni ###
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
index d1e7a61c150..023db395e97 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
@@ -9,8 +9,6 @@
 
 #include <memory>
 
-#ifdef WITH_INSPECTOR
-
 namespace facebook::react {
 
 namespace {
@@ -111,5 +109,3 @@ void JInspector::registerNatives() {
 }
 
 } // namespace facebook::react
-
-#endif
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.h
index 982f2af655c..897976e0ce7 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#ifdef WITH_INSPECTOR
-
 #include <jsinspector-modern/InspectorInterfaces.h>
 
 #include <fbjni/fbjni.h>
@@ -77,5 +75,3 @@ class JInspector : public jni::HybridClass<JInspector> {
 };
 
 } // namespace facebook::react
-
-#endif
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 19c0033c6fc..389990e65ca 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
@@ -16,17 +16,14 @@
 #include "CatalystInstanceImpl.h"
 #include "CxxModuleWrapperBase.h"
 #include "JCallback.h"
+#include "JInspector.h"
+#include "JInspectorFlags.h"
 #include "JReactMarker.h"
 #include "JavaScriptExecutorHolder.h"
 #include "ProxyExecutor.h"
 #include "WritableNativeArray.h"
 #include "WritableNativeMap.h"
 
-#ifdef WITH_INSPECTOR
-#include "JInspector.h"
-#include "JInspectorFlags.h"
-#endif
-
 #ifndef WITH_GLOGINIT
 #define WITH_GLOGINIT 1
 #endif
@@ -87,11 +84,8 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     ReadableNativeMap::registerNatives();
     WritableNativeMap::registerNatives();
     JReactMarker::registerNatives();
-
-#ifdef WITH_INSPECTOR
     JInspector::registerNatives();
     JInspectorFlags::registerNatives();
-#endif
   });
 }