diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK index 7752dfb04e57c3..c6bfc5cea0225e 100644 --- a/ReactAndroid/src/main/jni/react/jni/BUCK +++ b/ReactAndroid/src/main/jni/react/jni/BUCK @@ -1,7 +1,6 @@ load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "IS_OSS_BUILD", "react_native_xplat_dep", "react_native_xplat_target", "rn_xplat_cxx_library") EXPORTED_HEADERS = [ - "AndroidJSCFactory.h", "CxxModuleWrapper.h", "CxxModuleWrapperBase.h", "CxxSharedModuleWrapper.h", @@ -52,6 +51,7 @@ rn_xplat_cxx_library( ], deps = ([ "xplat//third-party/linker_lib:android", + "xplat//third-party/linker_lib:atomic", "xplat//folly:molly", "fbandroid//xplat/fbgloginit:fbgloginit", "xplat//fbsystrace:fbsystrace", diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp index 290a61f9aa2f57..20b134a5c84375 100644 --- a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +++ b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp @@ -9,7 +9,6 @@ #include #include -#include "AndroidJSCFactory.h" #include "CatalystInstanceImpl.h" #include "CxxModuleWrapper.h" #include "JavaScriptExecutorHolder.h" @@ -30,27 +29,6 @@ namespace react { namespace { -// TODO: can we avoid these wrapper classes, and instead specialize the logic in CatalystInstanceImpl -class JSCJavaScriptExecutorHolder : public HybridClass { - public: - static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JSCJavaScriptExecutor;"; - - static local_ref initHybrid(alias_ref, ReadableNativeMap* jscConfig) { - return makeCxxInstance(makeAndroidJSCExecutorFactory(jscConfig->consume())); - } - - static void registerNatives() { - registerHybrid({ - makeNativeMethod("initHybrid", JSCJavaScriptExecutorHolder::initHybrid), - }); - } - - private: - friend HybridBase; - using HybridBase::HybridBase; -}; - struct JavaJSExecutor : public JavaClass { static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/JavaJSExecutor;"; }; @@ -83,7 +61,6 @@ class ProxyJavaScriptExecutorHolder : public HybridClass