From 2c70227c09d9b51d647c8a6765e9122d224a3a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Sun, 21 Dec 2025 20:28:27 -0300
Subject: [PATCH] Fix Android build.

---
 projects/android-project/app/jni/eepp.mk      | 21 ++++++++++++++++++-
 .../window/backend/SDL2/clipboardsdl2.cpp     |  6 +++++-
 src/thirdparty/SOIL2                          |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/projects/android-project/app/jni/eepp.mk b/projects/android-project/app/jni/eepp.mk
index 0db472591..1e8c10fcd 100644
--- a/projects/android-project/app/jni/eepp.mk
+++ b/projects/android-project/app/jni/eepp.mk
@@ -25,6 +25,7 @@ EEPP_C_INCLUDES			:= \
 	$(EEPP_THIRD_PARTY_PATH)/mojoAL \
 	$(EEPP_THIRD_PARTY_PATH)/pcre2/src \
 	$(EEPP_THIRD_PARTY_PATH)/oniguruma \
+	$(EEPP_THIRD_PARTY_PATH)/SheenBidi/Headers \
 	$(EEPP_THIRD_PARTY_PATH)/efsw/include \
 	$(EEPP_BASE_PATH)/modules/eterm/include \
 	$(EEPP_BASE_PATH)/modules/eterm/src \
@@ -39,6 +40,7 @@ EEPP_C_FLAGS				:= \
 	-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit \
 	-DANDROID \
 	-DANDROID_NDK \
+	-DZ_HAVE_UNISTD_H \
 	-DDISABLE_IMPORTGL \
 	-Wall \
 	-Wno-unknown-pragmas \
@@ -108,7 +110,7 @@ LOCAL_C_INCLUDES		:= $(EEPP_C_INCLUDES)
 
 LOCAL_SRC_FILES			:= $(foreach F, $(CODE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
 
-LOCAL_STATIC_LIBRARIES	:= freetype libpng libwebp pcre2 oniguruma harfbuzz
+LOCAL_STATIC_LIBRARIES	:= freetype libpng libwebp pcre2 oniguruma harfbuzz sheenbidi
 
 LOCAL_SHARED_LIBRARIES	:= SDL2
 
@@ -330,6 +332,23 @@ LOCAL_SRC_FILES			:= $(foreach F, $(HARFBUZZ_SRCS), $(addprefix $(dir $(F)),$(no
 include $(BUILD_STATIC_LIBRARY)
 #*************** HARFBUZZ *************
 
+#*************** SHEENBIDI *************
+include $(CLEAR_VARS)
+
+LOCAL_PATH				:= $(EEPP_THIRD_PARTY_PATH)
+
+LOCAL_MODULE			:= sheenbidi
+
+SHEENBIDI_SRCS			:=  SheenBidi/Source/**.c
+
+LOCAL_C_INCLUDES		:= $(LOCAL_PATH)/SheenBidi/Headers
+LOCAL_CFLAGS			:= -Os -I$(LOCAL_PATH)/freetype2/include
+
+LOCAL_SRC_FILES			:= $(foreach F, $(SHEENBIDI_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
+
+include $(BUILD_STATIC_LIBRARY)
+#*************** SHEENBIDI *************
+
 #**************** SDL 2 ***************
 include $(CLEAR_VARS)
 
diff --git a/src/eepp/window/backend/SDL2/clipboardsdl2.cpp b/src/eepp/window/backend/SDL2/clipboardsdl2.cpp
index 6bae880a4..8ec43cd52 100644
--- a/src/eepp/window/backend/SDL2/clipboardsdl2.cpp
+++ b/src/eepp/window/backend/SDL2/clipboardsdl2.cpp
@@ -53,18 +53,22 @@ std::string ClipboardSDL::getPrimarySelectionText() {
 #if EE_PLATFORM == EE_PLATFORM_EMSCRIPTEN
 	return "";
 #else
+
+#if SDL_VERSION_ATLEAST(2, 26, 0)
 	if ( SDL_HasPrimarySelectionText() ) {
 		char* text = SDL_GetPrimarySelectionText();
 		std::string str( text );
 		SDL_free( text );
 		return str;
 	}
+#endif
+
 	return "";
 #endif
 }
 
 void ClipboardSDL::setPrimarySelectionText( const std::string& text ) {
-#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN
+#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN && SDL_VERSION_ATLEAST(2, 26, 0)
 	SDL_SetPrimarySelectionText( text.c_str() );
 #endif
 }
diff --git a/src/thirdparty/SOIL2 b/src/thirdparty/SOIL2
index bc9b68d3e..703320d93 160000
--- a/src/thirdparty/SOIL2
+++ b/src/thirdparty/SOIL2
@@ -1 +1 @@
-Subproject commit bc9b68d3eb6511bade642ce23a5f42043a942b05
+Subproject commit 703320d9305de08d1d8ceb6925196be4ada12456