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 index 5803c6741e2..aab5a3f4268 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK @@ -33,6 +33,7 @@ rn_xplat_cxx_library( ], exported_deps = [ "fbsource//xplat/jsi:jsi", + react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("turbomodule/core:core"), ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/TurboModuleManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/TurboModuleManager.cpp index 4cfc65712c2..7fbf35eb872 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/TurboModuleManager.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/TurboModuleManager.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -56,7 +57,9 @@ void TurboModuleManager::installJSIBindings() { [this](const std::string &name) { const auto moduleInstance = getJavaModule(name); // TODO: Pass in react Instance to JSCallInvoker instead. - const auto jsInvoker = std::make_shared(nullptr); + std::shared_ptr instance = nullptr; + std::weak_ptr weakInstance = instance; + const auto jsInvoker = std::make_shared(weakInstance); return moduleProvider_(name, moduleInstance, jsInvoker); }) );