From 3f3240caed66983a6759e6301c0ff7aced7e6de0 Mon Sep 17 00:00:00 2001
From: CamilleLaVey <camillelavey99@gmail.com>
Date: Thu, 24 Sep 2026 23:46:01 -0400
Subject: [PATCH] Fix android build

---
 src/android/app/src/main/jni/native.cpp       | 62 +++++++++----------
 src/video_core/engines/sw_blitter/blitter.cpp |  3 +
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 05b2f081eb..bd4d843473 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -738,6 +738,35 @@ const char* fallback_cpu_detection() {
     return s_result.c_str();
 }
 
+#ifdef ARCHITECTURE_arm64
+struct SystemDriverInfo {
+    VkPhysicalDeviceProperties properties{};
+    VkPhysicalDeviceDriverProperties driver{};
+};
+
+SystemDriverInfo QuerySystemDriverInfo(JNIEnv* env, jstring j_hook_lib_dir) {
+    const std::string hook_lib_dir = Common::Android::GetJString(env, j_hook_lib_dir);
+    const Common::DynamicLibrary library{adrenotools_open_libvulkan(
+        RTLD_NOW, 0, nullptr, hook_lib_dir.c_str(), nullptr, nullptr, nullptr, nullptr)};
+    Vulkan::vk::InstanceDispatch dld;
+    const Vulkan::vk::Instance instance = Vulkan::CreateInstance(library, dld, VK_API_VERSION_1_1);
+    const std::vector<VkPhysicalDevice> devices = instance.EnumeratePhysicalDevices();
+    if (devices.empty()) {
+        throw Vulkan::vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
+    }
+    SystemDriverInfo info{};
+    info.driver.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES;
+    VkPhysicalDeviceProperties2 properties2{
+        .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2,
+        .pNext = &info.driver,
+        .properties = {},
+    };
+    Vulkan::vk::PhysicalDevice(devices[0], dld).GetProperties2(properties2);
+    info.properties = properties2.properties;
+    return info;
+}
+#endif
+
 } // namespace
 
 extern "C" {
@@ -855,39 +884,6 @@ jboolean JNICALL Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_supportsCustomDri
 #endif
 }
 
-#ifdef ARCHITECTURE_arm64
-namespace {
-
-struct SystemDriverInfo {
-    VkPhysicalDeviceProperties properties{};
-    VkPhysicalDeviceDriverProperties driver{};
-};
-
-SystemDriverInfo QuerySystemDriverInfo(JNIEnv* env, jstring j_hook_lib_dir) {
-    const std::string hook_lib_dir = Common::Android::GetJString(env, j_hook_lib_dir);
-    const Common::DynamicLibrary library{adrenotools_open_libvulkan(
-        RTLD_NOW, 0, nullptr, hook_lib_dir.c_str(), nullptr, nullptr, nullptr, nullptr)};
-    Vulkan::vk::InstanceDispatch dld;
-    const Vulkan::vk::Instance instance = Vulkan::CreateInstance(library, dld, VK_API_VERSION_1_1);
-    const std::vector<VkPhysicalDevice> devices = instance.EnumeratePhysicalDevices();
-    if (devices.empty()) {
-        throw Vulkan::vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
-    }
-    SystemDriverInfo info{};
-    info.driver.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES;
-    VkPhysicalDeviceProperties2 properties2{
-        .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2,
-        .pNext = &info.driver,
-        .properties = {},
-    };
-    Vulkan::vk::PhysicalDevice(devices[0], dld).GetProperties2(properties2);
-    info.properties = properties2.properties;
-    return info;
-}
-
-}
-#endif
-
 jobjectArray Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_getSystemDriverInfo(
     JNIEnv* env, jobject j_obj, jobject j_surf, jstring j_hook_lib_dir) {
     std::string version_string{"1.1.0"};
diff --git a/src/video_core/engines/sw_blitter/blitter.cpp b/src/video_core/engines/sw_blitter/blitter.cpp
index 45df323e52..a360ffb125 100644
--- a/src/video_core/engines/sw_blitter/blitter.cpp
+++ b/src/video_core/engines/sw_blitter/blitter.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later