From 7bb1dbfd28dc59abc26680dfbf1ee45c6ec1409e Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 26 Feb 2024 23:35:53 -0500 Subject: [PATCH] android: fix x86 build --- src/android/app/src/main/jni/native.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 5d484a85e2..a0cdcd0b82 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -61,6 +61,7 @@ #include "video_core/renderer_base.h" #include "video_core/renderer_vulkan/renderer_vulkan.h" #include "video_core/vulkan_common/vulkan_instance.h" +#include "video_core/vulkan_common/vulkan_library.h" #include "video_core/vulkan_common/vulkan_surface.h" #define jconst [[maybe_unused]] const auto @@ -525,13 +526,16 @@ jboolean JNICALL Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_supportsCustomDri jobjectArray Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_getSystemDriverInfo( JNIEnv* env, jobject j_obj, jobject j_surf, jstring j_hook_lib_dir) { +#ifdef ARCHITECTURE_arm64 const char* file_redirect_dir_{}; int featureFlags{}; std::string hook_lib_dir = Common::Android::GetJString(env, j_hook_lib_dir); auto handle = adrenotools_open_libvulkan(RTLD_NOW, featureFlags, nullptr, hook_lib_dir.c_str(), nullptr, nullptr, file_redirect_dir_, nullptr); auto driver_library = std::make_shared(handle); - InputCommon::InputSubsystem input_subsystem; +#else + auto driver_library = Vulkan::OpenLibrary(); +#endif auto window = std::make_unique(ANativeWindow_fromSurface(env, j_surf), driver_library);