Implement 40250 classic client port

export-android.sh

@@ -25,10 +25,15 @@ GODOT="${GODOT:-godot}"
 ADB="${ADB:-$SDK/platform-tools/adb}"
 
 case "$CONFIG" in
-	Release) MODE="--export-release" ;;
-	*)       MODE="--export-debug" ;;
+	Release)
+		MODE="--export-release"
+		OUT="build/export/mtgodot-poc-release.apk"
+		;;
+	*)
+		MODE="--export-debug"
+		OUT="build/export/mtgodot-poc.apk"
+		;;
 esac
-OUT="build/export/mtgodot-poc$([ "$CONFIG" = Release ] && echo -release).apk"
 
 echo ">> NDK:  $ANDROID_NDK_ROOT"
 echo ">> JDK:  $JAVA_HOME"
@@ -58,9 +63,17 @@ if [ "$INSTALL" = 1 ]; then
 		echo ">> pushing assets.zip ($(du -h build/export/assets.zip | cut -f1)) -> $DEST"
 		"$ADB" shell mkdir -p /sdcard/Android/data/org.internal.mtgodotpoc/files/ || true
 		"$ADB" push build/export/assets.zip "$DEST"
+		if [ "$CONFIG" != "Release" ]; then
+			echo ">> copying assets.zip into the Debug app user:// directory"
+			# Android 14/15 may deny run-as reading /sdcard even for the app's own
+			# external files directory. Stream through adb instead.
+			"$ADB" shell "run-as org.internal.mtgodotpoc sh -c 'cat > files/assets.zip'" \
+				< build/export/assets.zip
+		fi
 	else
 		echo ">> NOTE: no build/export/assets.zip — run ./pack-assets.sh; the world won't render without it"
 	fi
-	"$ADB" shell am start -n org.internal.mtgodotpoc/com.godot.game.GodotApp
+	"$ADB" shell am start -W -n org.internal.mtgodotpoc/com.godot.game.GodotAppLauncher \
+		-a android.intent.action.MAIN -c android.intent.category.LAUNCHER
 	echo ">> logcat: $ADB logcat -s godot GodotError Godot"
 fi