Set CallInvokator on Android

packages/webgpu/android/CMakeLists.txt

@@ -61,6 +61,7 @@ target_include_directories(
         "${NODE_MODULES_DIR}/react-native/ReactCommon/runtimeexecutor"
         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni"
         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/react/turbomodule"
 
         ../cpp
         ../cpp/rnwgpu
@@ -84,5 +85,6 @@ target_link_libraries(
         android
         fbjni::fbjni
         ReactAndroid::jsi
+        ReactAndroid::reactnativejni
         webgpu_dawn
     )

packages/webgpu/android/build.gradle

@@ -87,10 +87,10 @@ android {
   }
 
   packagingOptions {
-    exclude "lib/arm64-v8a/libjsi.so"
-    exclude "lib/x86_64/libjsi.so"
-    exclude "lib/x86/libjsi.so"
-    exclude "lib/armeabi-v7a/libjsi.so"
+    excludes = [
+      "**/libjsi.so",
+      "**/libreactnativejni.so",
+    ]
   }
 
   buildFeatures {

packages/webgpu/android/cpp/cpp-adapter.cpp

@@ -5,6 +5,7 @@
 #include <jni.h>
 #include <jsi/jsi.h>
 
+#include <ReactCommon/CallInvokerHolder.h>
 #include <android/native_window_jni.h>
 #include <webgpu/webgpu_cpp.h>
 
@@ -17,13 +18,18 @@
 std::shared_ptr<rnwgpu::RNWebGPUManager> manager;
 
 extern "C" JNIEXPORT void JNICALL Java_com_webgpu_WebGPUModule_initializeNative(
-    JNIEnv *env, jobject /* this */, jlong jsRuntime, jobject jsInvokerHolder,
-    jobject blobModule) {
+    JNIEnv *env, jobject /* this */, jlong jsRuntime,
+    jobject jsCallInvokerHolder, jobject blobModule) {
   auto runtime = reinterpret_cast<facebook::jsi::Runtime *>(jsRuntime);
   jobject globalBlobModule = env->NewGlobalRef(blobModule);
+  auto jsCallInvoker{
+      facebook::jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>{
+          reinterpret_cast<facebook::react::CallInvokerHolder::javaobject>(
+              jsCallInvokerHolder)} -> cthis()
+          ->getCallInvoker()};
   auto platformContext =
       std::make_shared<rnwgpu::AndroidPlatformContext>(globalBlobModule);
-  manager = std::make_shared<rnwgpu::RNWebGPUManager>(runtime, nullptr,
+  manager = std::make_shared<rnwgpu::RNWebGPUManager>(runtime, jsCallInvoker,
                                                       platformContext);
 }
 
@@ -55,7 +61,7 @@ Java_com_webgpu_WebGPUView_switchToOffscreenSurface(JNIEnv *env, jobject thiz,
                                                     jint contextId) {
   auto &registry = rnwgpu::SurfaceRegistry::getInstance();
   auto nativeSurface = registry.getSurfaceInfo(contextId)->switchToOffscreen();
-  ANativeWindow_release(reinterpret_cast<ANativeWindow *>(nativeSurface));
+  // ANativeWindow_release(reinterpret_cast<ANativeWindow *>(nativeSurface));
 }
 
 extern "C" JNIEXPORT void JNICALL Java_com_webgpu_WebGPUView_onSurfaceDestroy(

packages/webgpu/cpp/rnwgpu/api/GPUCanvasContext.cpp

@@ -16,8 +16,9 @@ void GPUCanvasContext::configure(
       throw std::runtime_error("Error with SurfaceConfiguration");
     }
   }
-  if (!conv(surfaceConfiguration.usage, configuration->usage) || !conv(surfaceConfiguration.format, configuration->format)) {
-        throw std::runtime_error("Error with SurfaceConfiguration");
+  if (!conv(surfaceConfiguration.usage, configuration->usage) ||
+      !conv(surfaceConfiguration.format, configuration->format)) {
+    throw std::runtime_error("Error with SurfaceConfiguration");
   }
 
 #ifdef __APPLE__

packages/webgpu/cpp/rnwgpu/api/descriptors/GPUCanvasConfiguration.h

@@ -60,7 +60,9 @@ struct JSIConverter<std::shared_ptr<rnwgpu::GPUCanvasConfiguration>> {
                                                                       false);
       }
       if (value.hasProperty(runtime, "alphaMode")) {
-        auto prop = value.getProperty(runtime, "alphaMode").asString(runtime).utf8(runtime);
+        auto prop = value.getProperty(runtime, "alphaMode")
+                        .asString(runtime)
+                        .utf8(runtime);
         if (prop == "premultiplied") {
           result->alphaMode = wgpu::CompositeAlphaMode::Premultiplied;
         }