From 4add25e6c73946febcabb3794ab31fe55795ab9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 5 Aug 2026 00:07:47 +0200
Subject: [PATCH] Buildfixes, bump gradle

---
 android/jni/app-android.cpp | 6 +++++-
 build.gradle.kts            | 2 +-
 headless/Headless.cpp       | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 81ce40b6c7..4f0314b67c 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -1708,7 +1708,11 @@ static void VulkanEmuThread(ANativeWindow *wnd, GraphicsContext *graphicsContext
 	}
 
 	renderer_inited = true;
-	RunMainLoop(graphicsContext, new NativeApplication(), []() { return !exitRenderLoop; }, []() { ProcessFrameCommands(); });
+	RunMainLoop(graphicsContext, new NativeApplication(), [](GraphicsContext *graphicsContext) {
+		NativeFrame(graphicsContext);
+		ProcessFrameCommands();
+		return !exitRenderLoop;
+	});
 	renderer_inited = false;
 
 	// Shut the graphics context down to the same state it was in when we entered the render thread.
diff --git a/build.gradle.kts b/build.gradle.kts
index bdcc226c99..94f1c9630e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,4 @@
 plugins {
-	id("com.android.application") version "9.2.1" apply false
+	id("com.android.application") version "9.3.1" apply false
 	id("com.google.protobuf") version "0.10.0" apply false
 }
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index c274bfa7e7..fe7611e522 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -253,6 +253,12 @@ static GraphicsContext *CreateGraphicsContext(GPUCore gpuCore, std::string **dev
 		_assert_(false);
 		break;
 	}
+#elif PPSSPP_ARCH(LOONGARCH64)
+	// The loongarch64 cross-compilation toolchain has no SDL3 packages available (see the
+	// LOONGARCH64_DEVICE branch in CMakeLists.txt), so this build is compile-tested only and
+	// never actually needs to create a graphics context at runtime.
+	*deviceSetting = nullptr;
+	return nullptr;
 #else
 #error The Headless build is not supported on this platform. Please use SDL (Mac/Linux) or Windows (non-UWP).
 #endif