From 29b728020ff0f84bd9fc5505f5463dba190d8d5b Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 14 Apr 2025 19:49:15 +0200
Subject: [PATCH] android: fix STL (#13594)

- https://github.com/koreader/koreader-base/pull/2058
- https://github.com/koreader/android-luajit-launcher/pull/548

Close #13575.
---
 Makefile                         | 6 ------
 base                             | 2 +-
 platform/android/luajit-launcher | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 5c563d518..c9c252089 100644
--- a/Makefile
+++ b/Makefile
@@ -156,12 +156,6 @@ endif
 ifdef WIN32
 	@echo "[*] Install runtime libraries for win32..."
 	$(SYMLINK) $(WIN32_DIR)/*.dll $(INSTALL_DIR)/koreader/
-endif
-ifdef SHIP_SHARED_STL
-	@echo "[*] Install C++ runtime..."
-	cp -fL $(SHARED_STL_LIB) $(INSTALL_DIR)/koreader/libs/
-	chmod 755 $(INSTALL_DIR)/koreader/libs/$(notdir $(SHARED_STL_LIB))
-	$(STRIP) --strip-unneeded $(INSTALL_DIR)/koreader/libs/$(notdir $(SHARED_STL_LIB))
 endif
 	@echo "[*] Install plugins"
 	$(SYMLINK) plugins $(INSTALL_DIR)/koreader/
diff --git a/base b/base
index 5123a2402..eaa2d06df 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 5123a2402db98240b85bfe4e8a3b8afe06e75e02
+Subproject commit eaa2d06df13578d62097ed38b83a96cf94f452a0
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index 09a15ce97..594d479eb 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit 09a15ce97f7e8fc189df855665c2332589975baa
+Subproject commit 594d479eb3a48b15e83a225b0a7e6a7ca4c16826