Move 'Util' to a new location, and convert to Kotlin.
It's causing difficulties having generated and handwritten files under
the same namespace.
Change-Id: I52679fb2bfb0a07c27d1fec841598c84008cf56a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/192540
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jim Blackler <jimblackler@google.com>
diff --git a/tools/android/webgpu/src/main/cpp/Util.cpp b/tools/android/webgpu/src/main/cpp/Util.cpp
index 359ac51..1b86264 100644
--- a/tools/android/webgpu/src/main/cpp/Util.cpp
+++ b/tools/android/webgpu/src/main/cpp/Util.cpp
@@ -29,8 +29,7 @@
#include <android/native_window_jni.h>
-extern "C" JNIEXPORT jlong JNICALL Java_android_dawn_Util_windowFromSurface(JNIEnv* env,
- jclass thiz,
- jobject surface) {
+extern "C" JNIEXPORT jlong JNICALL
+Java_android_dawn_helper_Util_windowFromSurface(JNIEnv* env, jclass thiz, jobject surface) {
return reinterpret_cast<jlong>(ANativeWindow_fromSurface(env, surface));
}
diff --git a/tools/android/webgpu/src/main/java/android/dawn/Util.java b/tools/android/webgpu/src/main/java/android/dawn/Util.java
deleted file mode 100644
index ab5256b..0000000
--- a/tools/android/webgpu/src/main/java/android/dawn/Util.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package android.dawn;
-
-import android.view.Surface;
-
-public class Util {
- static {
- System.loadLibrary("webgpu_c_bundled");
- }
-
- public static native long windowFromSurface(Surface surface);
-}
diff --git a/tools/android/webgpu/src/main/java/android/dawn/helper/Util.kt b/tools/android/webgpu/src/main/java/android/dawn/helper/Util.kt
new file mode 100644
index 0000000..f6cbc32
--- /dev/null
+++ b/tools/android/webgpu/src/main/java/android/dawn/helper/Util.kt
@@ -0,0 +1,11 @@
+package android.dawn.helper
+
+import android.view.Surface
+
+object Util {
+ init {
+ System.loadLibrary("webgpu_c_bundled")
+ }
+
+ external fun windowFromSurface(surface: Surface?): Long
+}
\ No newline at end of file
