react-native-skia 3.0.0 → 3.0.1

package/android/build.gradle

@@ -76,7 +76,24 @@ def skiaLibsPath = useGraphite
 // Graphite build's Dawn release tag (libs/.dawn-version) with the tag
 // react-native-webgpu declares in its package.json `dawn` field.
 if (useGraphite) {
+    // Fail early rather than with a ninja "missing and no known rule" error.
+    def missingDawn = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"].findAll {
+        !file("${skiaLibsPath}/${it}/libwebgpu_dawn.so").exists()
+    }
+    if (!missingDawn.isEmpty()) {
+        throw new GradleException(
+            "react-native-skia: libwebgpu_dawn.so not found in ${skiaLibsPath} " +
+            "for ${missingDawn.join(', ')}. The installed react-native-skia-graphite-android " +
+            "package does not ship the shared Dawn library this Graphite build links against. " +
+            "Upgrade it and rebuild.")
+    }
+
+    // In-repo builds write the marker into libs/, npm installs ship it in the
+    // react-native-skia-graphite-android package.
     def dawnMarker = file("${projectDir}/../libs/.dawn-version")
+    if (!dawnMarker.exists()) {
+        dawnMarker = file("${skiaLibsPath}/.dawn-version")
+    }
     def webgpuDir = null
     try {
         webgpuDir = resolveNodePackage('react-native-webgpu', projectDir)

package/cpp/rnskia/RNDawnContext.h

@@ -144,6 +144,11 @@ public:
   }
 
   sk_sp<SkImage> MakeImageFromBuffer(void *buffer) {
+#if defined(__ANDROID__) && __ANDROID_API__ < 26
+    // AHardwareBuffer is only available from API 26
+    (void)buffer;
+    return nullptr;
+#else
 #ifdef __APPLE__
     wgpu::SharedTextureMemoryIOSurfaceDescriptor platformDesc;
     auto ioSurface = CVPixelBufferGetIOSurface((CVPixelBufferRef)buffer);
@@ -213,6 +218,7 @@ public:
       return nullptr;
     }
     return nullptr;
+#endif
   }
 
   // Create offscreen surface

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -142,15 +142,15 @@
   },
   "dependencies": {
     "canvaskit-wasm": "0.41.0",
-    "react-native-skia-graphite-android": "154.0.0",
-    "react-native-skia-graphite-apple-ios": "154.0.0",
-    "react-native-skia-graphite-apple-macos": "154.0.0",
+    "react-native-skia-graphite-android": "154.0.1",
+    "react-native-skia-graphite-apple-ios": "154.0.1",
+    "react-native-skia-graphite-apple-macos": "154.0.1",
     "react-reconciler": "0.31.0"
   },
   "graphiteDependencies": {
-    "react-native-skia-graphite-android": "154.0.0",
-    "react-native-skia-graphite-apple-ios": "154.0.0",
-    "react-native-skia-graphite-apple-macos": "154.0.0"
+    "react-native-skia-graphite-android": "154.0.1",
+    "react-native-skia-graphite-apple-ios": "154.0.1",
+    "react-native-skia-graphite-apple-macos": "154.0.1"
   },
   "eslintIgnore": [
     "node_modules/",

package/react-native-skia.podspec

@@ -37,6 +37,11 @@ install_apple_skia_libs = lambda do |base_dir, packages|
     src = File.join(pkg_dir, 'libs')
     next unless Dir.exist?(src) && !Dir.glob(File.join(src, '*.xcframework')).empty?
 
+    # Graphite packages carry the Dawn release tag they ship (libs/.dawn-version),
+    # used below for the react-native-webgpu version check.
+    dawn_version = File.join(src, '.dawn-version')
+    FileUtils.cp(dawn_version, File.join(base_dir, 'libs', '.dawn-version')) if File.exist?(dawn_version)
+
     version = JSON.parse(File.read(File.join(pkg_dir, 'package.json')))['version'].to_s
     dest = File.join(base_dir, 'libs', platform)
     marker = File.join(dest, '.version')
@@ -110,7 +115,19 @@ if use_graphite && has_webgpu_pkg
     Pod::UI.puts "react-native-skia: Dawn versions match (#{skia_dawn})"
   end
 end
-framework_names += ['libwebgpu_dawn'] if use_graphite && !has_webgpu_pkg
+if use_graphite && !has_webgpu_pkg
+  # CocoaPods silently skips missing vendored frameworks, which would surface
+  # later as undefined dawn::native symbols at link time. Fail early instead.
+  %w[ios macos].each do |platform|
+    platform_dir = File.join(__dir__, 'libs', platform)
+    # A missing libs/<platform> is reported by the prebuilt binaries check below.
+    next if !Dir.exist?(platform_dir) || Dir.exist?(File.join(platform_dir, 'libwebgpu_dawn.xcframework'))
+    raise "react-native-skia: libwebgpu_dawn.xcframework not found in libs/#{platform}. " \
+          "The installed #{apple_skia_packages[platform]} package does not ship the shared " \
+          "Dawn library this Graphite build links against. Upgrade it, then run `pod install` again."
+  end
+  framework_names += ['libwebgpu_dawn']
+end
 
 # Verify that the prebuilt binaries are available (copied in above from the npm
 # packages, or downloaded by install-skia-graphite for in-repo Graphite builds).