From 5f48331f5d08efd607816093f2f05d7a4b096ba1 Mon Sep 17 00:00:00 2001
From: Fredia Huya-Kouadio <fhuyakou@gmail.com>
Date: Sat, 14 Sep 2024 12:15:22 -0700
Subject: [PATCH] Update the Android editor build scripts to match the updated
 build flavors in https://github.com/godotengine/godot/pull/96967

---
 build-android/build.sh | 20 ++++++++++----------
 build-release.sh       |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build-android/build.sh b/build-android/build.sh
index b5b62a6..6710706 100755
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -37,22 +37,22 @@ if [ "${CLASSICAL}" == "1" ]; then
   pushd platform/android/java
   # Generate the regular Android editor.
   ./gradlew generateGodotEditor
-  # Generate the Android editor for Meta devices.
-  ./gradlew generateGodotMetaEditor
+  # Generate the Android editor for HorizonOS devices.
+  ./gradlew generateGodotHorizonOSEditor
   popd
 
   mkdir -p /root/out/tools
   # Copy the generated Android editor binaries (apk & aab).
   if [ "$store_release" == "yes" ]; then
-    cp bin/android_editor_builds/android_editor-google-release.apk /root/out/tools/android_editor.apk
-    cp bin/android_editor_builds/android_editor-google-release.aab /root/out/tools/android_editor.aab
-    # For the Meta build, we only copy the apk.
-    cp bin/android_editor_builds/android_editor-meta-release.apk /root/out/tools/android_editor_meta.apk
+    cp bin/android_editor_builds/android_editor-android-release.apk /root/out/tools/android_editor.apk
+    cp bin/android_editor_builds/android_editor-android-release.aab /root/out/tools/android_editor.aab
+    # For the HorizonOS build, we only copy the apk.
+    cp bin/android_editor_builds/android_editor-horizonos-release.apk /root/out/tools/android_editor_horizonos.apk
   else
-    cp bin/android_editor_builds/android_editor-google-debug.apk /root/out/tools/android_editor.apk
-    cp bin/android_editor_builds/android_editor-google-debug.aab /root/out/tools/android_editor.aab
-    # For the Meta build, we only copy the apk.
-    cp bin/android_editor_builds/android_editor-meta-debug.apk /root/out/tools/android_editor_meta.apk
+    cp bin/android_editor_builds/android_editor-android-debug.apk /root/out/tools/android_editor.apk
+    cp bin/android_editor_builds/android_editor-android-debug.aab /root/out/tools/android_editor.aab
+    # For the HorizonOS build, we only copy the apk.
+    cp bin/android_editor_builds/android_editor-horizonos-debug.apk /root/out/tools/android_editor_horizonos.apk
   fi
 
   # Restart from a clean tarball, as we'll copy all the contents
diff --git a/build-release.sh b/build-release.sh
index 608a0f3..bb61150 100755
--- a/build-release.sh
+++ b/build-release.sh
@@ -366,8 +366,8 @@ if [ "${build_classical}" == "1" ]; then
   # Editor
   binname="${godot_basename}_android_editor.apk"
   cp out/android/tools/android_editor.apk ${reldir}/${binname}
-  binname="${godot_basename}_android_editor_meta.apk"
-  cp out/android/tools/android_editor_meta.apk ${reldir}/${binname}
+  binname="${godot_basename}_android_editor_horizonos.apk"
+  cp out/android/tools/android_editor_horizonos.apk ${reldir}/${binname}
   binname="${godot_basename}_android_editor.aab"
   cp out/android/tools/android_editor.aab ${reldir}/${binname}