From 92a4ac45a428c7c172e499b37b98cdafe83d3ce7 Mon Sep 17 00:00:00 2001
From: Briar <205427297+icybriarr@users.noreply.github.com>
Date: Wed, 2 Apr 2025 06:03:08 +0200
Subject: [PATCH] android: Switch to custom Oboe submodule

---
 .gitmodules                   | 3 +++
 externals/CMakeLists.txt      | 6 ++++++
 externals/oboe                | 1 +
 src/audio_core/CMakeLists.txt | 8 +++-----
 vcpkg.json                    | 9 ---------
 5 files changed, 13 insertions(+), 14 deletions(-)
 create mode 160000 externals/oboe

diff --git a/.gitmodules b/.gitmodules
index 1c84070fc0..976106865c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -67,3 +67,6 @@
 [submodule "Vulkan-Utility-Libraries"]
 	path = externals/Vulkan-Utility-Libraries
 	url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
+[submodule "oboe"]
+	path = externals/oboe
+	url = https://github.com/eden-emulator/oboe.git
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d49a2e43e9..290384c570 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -314,3 +314,9 @@ endif()
 if (NOT TARGET SimpleIni::SimpleIni)
     add_subdirectory(simpleini)
 endif()
+
+# oboe
+if (ANDROID)
+    add_subdirectory(oboe)
+    add_library(oboe::oboe ALIAS oboe)
+endif()
diff --git a/externals/oboe b/externals/oboe
new file mode 160000
index 0000000000..17ab1e4f41
--- /dev/null
+++ b/externals/oboe
@@ -0,0 +1 @@
+Subproject commit 17ab1e4f41e5028b344a79984ee3eb7b071f4167
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index 4e4ed1789f..8c94109de0 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -251,15 +251,13 @@ if (ENABLE_SDL2)
     target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
 endif()
 
-if (ANDROID)
+if(ANDROID)
     target_sources(audio_core PRIVATE
         sink/oboe_sink.cpp
         sink/oboe_sink.h
     )
-
-    # FIXME: this port seems broken, it cannot be imported with find_package(oboe REQUIRED)
-    target_link_libraries(audio_core PRIVATE "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/liboboe.a")
-    target_compile_definitions(audio_core PRIVATE HAVE_OBOE)
+    target_link_libraries(audio_core PRIVATE oboe)
+    target_compile_definitions(audio_core PUBLIC HAVE_OBOE)
 endif()
 
 if (YUZU_USE_PRECOMPILED_HEADERS)
diff --git a/vcpkg.json b/vcpkg.json
index cbac9db200..418026db62 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -41,15 +41,6 @@
                     "platform": "windows"
                 }
             ]
-        },
-        "android": {
-            "description": "Enable Android dependencies",
-            "dependencies": [
-                {
-                    "name": "oboe",
-                    "platform": "android"
-                }
-            ]
         }
     },
     "overrides": [