From 95ed6d23dbc5d71b4f43514ab023b0622bbc1277 Mon Sep 17 00:00:00 2001
From: Fredia Huya-Kouadio <fhuyakou@gmail.com>
Date: Sun, 30 Mar 2025 19:11:43 -0700
Subject: [PATCH] Update the Android build scripts to allow exporting 'Godot
 Tools' Android library to MavenCentral

---
 build-android/build.sh               | 6 +-----
 build-android/upload-mavencentral.sh | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build-android/build.sh b/build-android/build.sh
index 9a1941f..45358db 100755
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -60,11 +60,7 @@ if [ "${CLASSICAL}" == "1" ]; then
     cp bin/android_editor_builds/android_editor-picoos-debug.apk /root/out/tools/android_editor_picoos.apk
   fi
 
-  # Restart from a clean tarball, as we'll copy all the contents
-  # outside the container for the MavenCentral upload.
-  rm -rf /root/godot/*
-  tar xf /root/godot.tar.gz --strip-components=1
-  cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/
+  # Template builds
 
   $SCONS platform=android arch=arm32 $OPTIONS target=template_debug
   $SCONS platform=android arch=arm32 $OPTIONS target=template_release
diff --git a/build-android/upload-mavencentral.sh b/build-android/upload-mavencentral.sh
index 9b43e6a..1a4bb6f 100755
--- a/build-android/upload-mavencentral.sh
+++ b/build-android/upload-mavencentral.sh
@@ -15,4 +15,4 @@ ${PODMAN} run -it --rm \
     "source /root/keystore/config.sh && \
     cp -r /root/godot/.gradle /root && \
     cd /root/godot/platform/android/java && \
-    ./gradlew publishTemplateReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"
+    ./gradlew publishAllPublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"