Fix Android native Vulkan initialization and missing Oboe symbols

osu.Android/Native/oboe_audio.cpp

@@ -82,6 +82,11 @@ extern "C" {
         if (audio) audio->start();
     }
 
+    void nOboeStop(long audioPtr) {
+        OboeAudio* audio = (OboeAudio*)audioPtr;
+        if (audio) audio->stop();
+    }
+
     double nGetTimestamp(long audioPtr) {
         OboeAudio* audio = (OboeAudio*)audioPtr;
         return audio ? audio->getTimestamp() : 0.0;

osu.Android/Native/vulkan_renderer.cpp

@@ -11,6 +11,13 @@
 #define LOG_TAG "OsuVulkan"
 #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
 
+static JavaVM* g_vm = nullptr;
+
+jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+    g_vm = vm;
+    return JNI_VERSION_1_6;
+}
+
 const int MAX_FRAMES_IN_FLIGHT = 2;
 
 VulkanRenderer::VulkanRenderer() : instance(VK_NULL_HANDLE), window(nullptr), surface(VK_NULL_HANDLE),
@@ -371,10 +378,17 @@ extern "C" {
         if (rendererPtr) delete (VulkanRenderer*)rendererPtr;
     }
 
-    bool nVulkanInitialize(long rendererPtr, void* window) {
+    bool nVulkanInit(long rendererPtr, void* surfaceJni) {
         VulkanRenderer* renderer = (VulkanRenderer*)rendererPtr;
-        if (!renderer || !window) return false;
-        return renderer->initialize((ANativeWindow*)window);
+        if (!renderer || !surfaceJni) return false;
+
+        JNIEnv* env = nullptr;
+        if (g_vm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK) {
+             return false;
+        }
+
+        ANativeWindow* window = ANativeWindow_fromSurface(env, (jobject)surfaceJni);
+        return renderer->initialize(window);
     }
 
     void nVulkanRender(long rendererPtr) {

osu.Android/OsuGameActivity.cs

@@ -282,5 +282,26 @@
 
             await game.Import(tasks.ToArray()).ConfigureAwait(false);
         }, TaskCreationOptions.LongRunning);
+
+        public global::Android.Views.Surface? GetSurface()
+        {
+            var rootView = Window?.DecorView;
+            if (rootView == null) return null;
+            return findSurfaceView(rootView)?.Holder?.Surface;
+        }
+
+        private global::Android.Views.SurfaceView? findSurfaceView(global::Android.Views.View view)
+        {
+            if (view is global::Android.Views.SurfaceView sv) return sv;
+            if (view is global::Android.Views.ViewGroup vg)
+            {
+                for (int i = 0; i < vg.ChildCount; i++)
+                {
+                    var found = findSurfaceView(vg.GetChildAt(i));
+                    if (found != null) return found;
+                }
+            }
+            return null;
+        }
     }
 }

osu.Android/OsuGameAndroid.cs

@@ -96,7 +96,7 @@ protected override void LoadComplete()
                         try
                         {
                             vulkanRenderer = new Native.VulkanRenderer();
-                            vulkanRenderer.Initialize(gameActivity.Window!.Handle);
+                            vulkanRenderer.Initialize(gameActivity.GetSurface()?.Handle ?? IntPtr.Zero);
 
                             vulkanHook = new VulkanHook(() => vulkanRenderer?.Render());
                             Add(vulkanHook);