From a2fd82d18b71a0679c9d844be5cf9fe69ac0be18 Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Tue, 14 Jul 2026 22:52:13 -0600
Subject: [PATCH] Android: Copy libc++_shared.so in stage-jni-libs.sh

---
 platforms/android/scripts/stage-jni-libs.sh | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/platforms/android/scripts/stage-jni-libs.sh b/platforms/android/scripts/stage-jni-libs.sh
index a30d961156..3984cf03ee 100755
--- a/platforms/android/scripts/stage-jni-libs.sh
+++ b/platforms/android/scripts/stage-jni-libs.sh
@@ -61,14 +61,33 @@ rm -rf "$APP_DIR/x86" "$APP_DIR/arm64-v8a" "$APP_DIR/x86_64"
 
 for abi in $ANDROID_STAGE_ABIS; do
   case "$abi" in
-    arm64-v8a) src="$ROOT_DIR/build/android-arm64/libmain.so" ;;
-    x86_64) src="$ROOT_DIR/build/android-x86_64/libmain.so" ;;
+    arm64-v8a)
+      src="$ROOT_DIR/build/android-arm64/libmain.so"
+      triple="aarch64-linux-android"
+      ;;
+    x86_64)
+      src="$ROOT_DIR/build/android-x86_64/libmain.so"
+      triple="x86_64-linux-android"
+      ;;
     *)
       echo "Unsupported ABI '$abi'. Supported ABIs: arm64-v8a x86_64" >&2
       exit 1
       ;;
   esac
   copy_lib "$abi" "$src"
+  if [[ -n "$STRIP_TOOL" ]]; then
+    stl="$(dirname "$STRIP_TOOL")/../sysroot/usr/lib/$triple/libc++_shared.so"
+    if [[ -f "$stl" ]]; then
+      cp -f "$stl" "$APP_DIR/$abi/libc++_shared.so"
+      echo "Staged $stl -> $APP_DIR/$abi/libc++_shared.so"
+    else
+      echo "Missing libc++_shared.so for $abi at $stl" >&2
+      exit 1
+    fi
+  else
+    echo "Cannot stage libc++_shared.so for $abi (NDK not found)" >&2
+    exit 1
+  fi
 done
 
 # Stage bundled mod packages into the app's assets source dir.