Back out > Add CompositeReactPackageTurboModuleManagerDelegate

Summary: This change caused some internal regression in release builds, hence reverting it Changelog: [Internal] [Changed] - Back out > Add CompositeReactPackageTurboModuleManagerDelegate Reviewed By: alsun2001 Differential Revision: D36182014 fbshipit-source-id: e49fc897f3b1a2e9d33fcb7687244be74020c5be
facebook · May 5, 2022 · e5469c4 · e5469c4
1 parent 870755f
commit e5469c4
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 181 deletions.
diff --git a/...oid/src/main/java/com/facebook/react/CompositeReactPackageTurboModuleManagerDelegate.java b/...oid/src/main/java/com/facebook/react/CompositeReactPackageTurboModuleManagerDelegate.java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
@@ -55,7 +55,7 @@ LOCAL_SHARED_LIBRARIES = libfb libfbjni libreact_nativemodule_core libjsi
 LOCAL_STATIC_LIBRARIES = libcallinvokerholder libreactperfloggerjni
 
 # Compile all local c++ files
-LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CompositeTurboModuleManagerDelegate.cpp $(LOCAL_PATH)/ReactCommon/OnLoad.cpp $(LOCAL_PATH)/ReactCommon/TurboModuleManager.cpp
+LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/TurboModuleManager.cpp $(LOCAL_PATH)/ReactCommon/OnLoad.cpp
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
@@ -3,13 +3,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_nat
 rn_xplat_cxx_library(
     name = "jni",
     srcs = [
-        "ReactCommon/CompositeTurboModuleManagerDelegate.cpp",
         "ReactCommon/OnLoad.cpp",
         "ReactCommon/TurboModuleManager.cpp",
     ],
     header_namespace = "",
     exported_headers = {
-        "ReactCommon/CompositeTurboModuleManagerDelegate.h": "ReactCommon/CompositeTurboModuleManagerDelegate.h",
         "ReactCommon/TurboModuleManager.h": "ReactCommon/TurboModuleManager.h",
         "ReactCommon/TurboModuleManagerDelegate.h": "ReactCommon/TurboModuleManagerDelegate.h",
     },

diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/CMakeLists.txt b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/CMakeLists.txt
@@ -43,9 +43,8 @@ target_link_libraries(callinvokerholder
 add_library(
         turbomodulejsijni
         SHARED
-        ReactCommon/CompositeTurboModuleManagerDelegate.cpp
-        ReactCommon/OnLoad.cpp
         ReactCommon/TurboModuleManager.cpp
+        ReactCommon/OnLoad.cpp
 )
 
 target_include_directories(

diff --git a/...m/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.cpp b/...m/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.cpp
diff --git a/...com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.h b/...com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp
@@ -9,7 +9,6 @@
 #include <fbjni/fbjni.h>
 #include <reactperflogger/JNativeModulePerfLogger.h>
 
-#include "CompositeTurboModuleManagerDelegate.h"
 #include "TurboModuleManager.h"
 
 void jniEnableCppLogging(
@@ -26,8 +25,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
     // "ComponentDescriptorFactory" is defined in Fabric
     facebook::react::TurboModuleManager::registerNatives();
 
-    facebook::react::CompositeTurboModuleManagerDelegate::registerNatives();
-
     facebook::jni::registerNatives(
         "com/facebook/react/turbomodule/core/TurboModulePerfLogger",
         {makeNativeMethod("jniEnableCppLogging", jniEnableCppLogging)});