Injecting on Android

Author: kraenhansen

packages/react-native-node-api-modules/android/CMakeLists.txt

@@ -3,35 +3,33 @@ cmake_minimum_required(VERSION 3.13)
 project(react-native-node-api-modules)
 set(CMAKE_CXX_STANDARD 20)
 
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(hermes-engine REQUIRED CONFIG)
+
+add_subdirectory(../weak-node-api weak-node-api)
+
+target_compile_definitions(weak-node-api
+  PRIVATE
+  NAPI_VERSION=8
+)
+
 add_library(node-api-host SHARED
   src/main/cpp/OnLoad.cpp
   ../cpp/CxxNodeApiHostModule.cpp
+  ../cpp/WeakNodeApiInjector.cpp
 )
 
 target_include_directories(node-api-host PRIVATE
   ../cpp
-  ../include
+  ../weak-node-api
+  ../weak-node-api/include
 )
 
-find_package(ReactAndroid REQUIRED CONFIG)
-find_package(hermes-engine REQUIRED CONFIG)
-
 target_link_libraries(node-api-host
   # android
   ReactAndroid::reactnative
   ReactAndroid::jsi
   hermes-engine::libhermes
+  weak-node-api
   # react_codegen_NodeApiHostSpec
-)
-
-add_subdirectory(../weak-node-api weak-node-api)
-
-target_compile_definitions(weak-node-api
-  PRIVATE
-  # NAPI_VERSION=8
-  NODE_API_REEXPORT=1
-)
-target_link_libraries(weak-node-api
-  node-api-host
-  hermes-engine::libhermes
-)
+)

packages/react-native-node-api-modules/android/build.gradle

@@ -48,6 +48,7 @@ android {
     sourceSets {
       main {
         manifest.srcFile "src/main/AndroidManifestNew.xml"
+        // jniLibs.srcDirs "../weak-node-api/libweak-node-api.android.node"
       }
     }
   }

packages/react-native-node-api-modules/android/src/main/cpp/OnLoad.cpp

@@ -3,9 +3,11 @@
 #include <ReactCommon/CxxTurboModuleUtils.h>
 
 #include <CxxNodeApiHostModule.hpp>
+#include <WeakNodeApiInjector.hpp>
 
 // Called when the library is loaded
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+  callstack::nodeapihost::injectIntoWeakNodeApi();
   // Register the C++ TurboModule
   facebook::react::registerCxxModuleToGlobalModuleMap(
       callstack::nodeapihost::CxxNodeApiHostModule::kModuleName,