From 9713efc404c636a00e377368f8b364015b2999c8 Mon Sep 17 00:00:00 2001
From: Siavash Sameni <manwefarm@proton.me>
Date: Tue, 26 May 2026 09:05:09 +0400
Subject: [PATCH] chore(android): add release debuggable build

---
 scripts/android-build-async.sh |  1 +
 scripts/build-tauri-android.sh | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/scripts/android-build-async.sh b/scripts/android-build-async.sh
index 1a8e673..317d9c7 100755
--- a/scripts/android-build-async.sh
+++ b/scripts/android-build-async.sh
@@ -12,6 +12,7 @@
 #   ./scripts/android-build-async.sh --rust    # force-clean Rust target cache
 #   ./scripts/android-build-async.sh --no-pull # skip git fetch on remote
 #   ./scripts/android-build-async.sh --debug   # debug APK
+#   ./scripts/android-build-async.sh --release-debuggable  # release APK with run-as dumps
 #   ./scripts/android-build-async.sh --wait    # block until done, then tail status
 #
 # Progress / completion: ntfy.sh/wzp (handled by build-tauri-android.sh).
diff --git a/scripts/build-tauri-android.sh b/scripts/build-tauri-android.sh
index 13965e6..694f61a 100755
--- a/scripts/build-tauri-android.sh
+++ b/scripts/build-tauri-android.sh
@@ -17,6 +17,7 @@ set -euo pipefail
 # Usage:
 #   ./scripts/build-tauri-android.sh                  # full pipeline (release, arm64 only)
 #   ./scripts/build-tauri-android.sh --debug          # debug APK (faster, no optimisation)
+#   ./scripts/build-tauri-android.sh --release-debuggable  # release APK with android:debuggable=true
 #   ./scripts/build-tauri-android.sh --no-pull        # skip git fetch
 #   ./scripts/build-tauri-android.sh --rust           # force-clean rust target
 #   ./scripts/build-tauri-android.sh --init           # also run `cargo tauri android init`
@@ -39,6 +40,7 @@ REBUILD_RUST=0
 DO_PULL=1
 DO_INIT=0
 BUILD_RELEASE=1
+RELEASE_DEBUGGABLE=0
 BUILD_ARCH="arm64"
 NEXT_IS_ARCH=0
 for arg in "$@"; do
@@ -53,6 +55,7 @@ for arg in "$@"; do
         --no-pull)  DO_PULL=0 ;;
         --init)     DO_INIT=1 ;;
         --debug)    BUILD_RELEASE=0 ;;
+        --release-debuggable) RELEASE_DEBUGGABLE=1 ;;
         --arch)     NEXT_IS_ARCH=1 ;;
         -h|--help)
             sed -n '3,32p' "$0"
@@ -93,6 +96,7 @@ REBUILD_RUST="${3:-0}"
 DO_INIT="${4:-0}"
 BUILD_RELEASE="${5:-0}"
 BUILD_ARCH="${6:-arm64}"
+RELEASE_DEBUGGABLE="${7:-0}"
 
 LOG_FILE=/tmp/wzp-tauri-build.log
 GIT_HASH="unknown"  # populated after fetch
@@ -192,6 +196,7 @@ docker run --rm \
     -e DO_INIT="$DO_INIT" \
     -e PROFILE_FLAG="$PROFILE_FLAG" \
     -e BUILD_ARCH="$BUILD_ARCH" \
+    -e RELEASE_DEBUGGABLE="$RELEASE_DEBUGGABLE" \
     -v "$BASE_DIR/data/source:/build/source" \
     -v "$BASE_DIR/data/cache/cargo-registry:/home/builder/.cargo/registry" \
     -v "$BASE_DIR/data/cache/cargo-git:/home/builder/.cargo/git" \
@@ -218,6 +223,21 @@ if [ "${DO_INIT}" = "1" ] || [ ! -x gen/android/gradlew ]; then
     cargo tauri android init 2>&1 | tail -20
 fi
 
+if [ "${RELEASE_DEBUGGABLE}" = "1" ]; then
+    MANIFEST="gen/android/app/src/main/AndroidManifest.xml"
+    if [ -f "$MANIFEST" ]; then
+        echo ">>> Marking release APK debuggable for frame-dump run-as access"
+        if grep -q "android:debuggable=" "$MANIFEST"; then
+            sed -i "s/android:debuggable=\"[^\"]*\"/android:debuggable=\"true\"/" "$MANIFEST"
+        else
+            perl -0pi -e "s/(<application\\b[^>]*)(>)/\$1\\n        android:debuggable=\"true\"\$2/s" "$MANIFEST"
+        fi
+        grep -n "debuggable\\|<application" "$MANIFEST"
+    else
+        echo ">>> WARNING: AndroidManifest.xml not found; release APK will not be debuggable"
+    fi
+fi
+
 # ─── Arch list from BUILD_ARCH env var ───────────────────────────────────
 case "${BUILD_ARCH}" in
     arm64)  ARCHS="arm64" ;;
@@ -461,11 +481,11 @@ REMOTE_SCRIPT
 
 ssh_cmd "chmod +x /tmp/wzp-tauri-build.sh"
 
-notify_local "WZP Tauri Android build dispatched (branch=$BRANCH, arch=$BUILD_ARCH, release=$BUILD_RELEASE)"
+notify_local "WZP Tauri Android build dispatched (branch=$BRANCH, arch=$BUILD_ARCH, release=$BUILD_RELEASE, release-debuggable=$RELEASE_DEBUGGABLE)"
 log "Triggering remote build (branch=$BRANCH, arch=$BUILD_ARCH)..."
 
 # Run; last lines are APK_REMOTE_PATH=...  (one per arch)
-REMOTE_OUTPUT=$(ssh_cmd "/tmp/wzp-tauri-build.sh '$BRANCH' '$DO_PULL' '$REBUILD_RUST' '$DO_INIT' '$BUILD_RELEASE' '$BUILD_ARCH'" || true)
+REMOTE_OUTPUT=$(ssh_cmd "/tmp/wzp-tauri-build.sh '$BRANCH' '$DO_PULL' '$REBUILD_RUST' '$DO_INIT' '$BUILD_RELEASE' '$BUILD_ARCH' '$RELEASE_DEBUGGABLE'" || true)
 echo "$REMOTE_OUTPUT" | tail -60
 
 # Download all produced APKs