android: Switch to custom Oboe submodule

.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

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()

externals/oboe

@@ -0,0 +1 @@
+Subproject commit 17ab1e4f41e5028b344a79984ee3eb7b071f4167

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
     )
-
+    target_link_libraries(audio_core PRIVATE oboe)
-    # FIXME: this port seems broken, it cannot be imported with find_package(oboe REQUIRED)
+    target_compile_definitions(audio_core PUBLIC HAVE_OBOE)
-    target_link_libraries(audio_core PRIVATE "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/liboboe.a")
-    target_compile_definitions(audio_core PRIVATE HAVE_OBOE)
 endif()
 
 if (YUZU_USE_PRECOMPILED_HEADERS)

vcpkg.json

@@ -41,15 +41,6 @@
                     "platform": "windows"
                 }
             ]
-        },
-        "android": {
-            "description": "Enable Android dependencies",
-            "dependencies": [
-                {
-                    "name": "oboe",
-                    "platform": "android"
-                }
-            ]
         }
     },
     "overrides": [