From 724feb151b25966feca810303e9e7fc96494bb9a Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 17 May 2025 00:26:15 +0700
Subject: [PATCH] [android] Fix JNI building in no-unity mode

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp      | 2 ++
 android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp | 2 +-
 .../src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp b/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp
index 05b7f5cd0..eaba5327d 100644
--- a/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp
@@ -2,6 +2,8 @@
 
 #include "map/gps_tracker.hpp"
 
+#include "app/organicmaps/core/jni_helper.hpp"
+
 #include <chrono>
 
 extern "C"
diff --git a/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp b/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp
index 2cac1df33..4b6b7b30d 100644
--- a/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp
@@ -10,7 +10,7 @@ GuiThread::GuiThread()
 {
   JNIEnv * env = jni::GetEnv();
 
-  m_class = GetGlobalClassRef(env, "app/organicmaps/util/concurrency/UiThread");
+  m_class = jni::GetGlobalClassRef(env, "app/organicmaps/util/concurrency/UiThread");
   ASSERT(m_class, ());
 
   m_method = env->GetStaticMethodID(m_class, "forwardToMainThread", "(J)V");
diff --git a/android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp b/android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp
index 3b1678cd1..5436f3e96 100644
--- a/android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp
@@ -2,6 +2,8 @@
 
 #include "platform/settings.hpp"
 
+#include "app/organicmaps/core/jni_helper.hpp"
+
 extern "C"
 {
 JNIEXPORT void JNICALL