From 88701e9f209175b9e03f1471ffe732cc84afac35 Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Wed, 12 Feb 2025 12:05:50 +0100
Subject: [PATCH] GDExtension: Build Android libs with editor features (#284)

Also, fix the macOS Vulkan SDK installation step in CI.

Resolves GH-282.
---
 .github/workflows/gdextension.yml |  8 ++++----
 .github/workflows/macos.yml       |  6 ++++--
 gdextension/limboai.gdextension   | 12 ++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml
index b784816..71f1aaf 100644
--- a/.github/workflows/gdextension.yml
+++ b/.github/workflows/gdextension.yml
@@ -122,7 +122,7 @@ jobs:
           - name: 🤖 Android (arm64, debug)
             runner: ubuntu-20.04
             platform: android
-            target: template_debug
+            target: editor
             arch: arm64
             should-build: ${{ !inputs.test-build }}
 
@@ -136,7 +136,7 @@ jobs:
           - name: 🤖 Android (arm32, debug)
             runner: ubuntu-20.04
             platform: android
-            target: template_debug
+            target: editor
             arch: arm32
             should-build: ${{ !inputs.test-build }}
 
@@ -150,7 +150,7 @@ jobs:
           - name: 🤖 Android (x86_64, debug)
             runner: ubuntu-20.04
             platform: android
-            target: template_debug
+            target: editor
             arch: x86_64
             should-build: ${{ !inputs.test-build }}
 
@@ -164,7 +164,7 @@ jobs:
           - name: 🤖 Android (x86_32, debug)
             runner: ubuntu-20.04
             platform: android
-            target: template_debug
+            target: editor
             arch: x86_32
             should-build: ${{ !inputs.test-build }}
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 4a871cc..6b44cf3 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -168,10 +168,12 @@ jobs:
           # ! Note: Vulkan SDK changed packaging, so we need to inline these steps for the time being.
           #sh misc/scripts/install_vulkan_sdk_macos.sh
 
+          curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/config.json" -o /tmp/vulkan-sdk.json
+          sdk_version=`jq -r '.version' /tmp/vulkan-sdk.json`
           curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip" -o /tmp/vulkan-sdk.zip
           unzip /tmp/vulkan-sdk.zip -d /tmp
-          /tmp/InstallVulkan.app/Contents/MacOS/InstallVulkan --accept-licenses --default-answer --confirm-command install
-          rm -Rf /tmp/InstallVulkan.app
+          /tmp/InstallVulkan-${sdk_version}.app/Contents/MacOS/InstallVulkan-${sdk_version} --accept-licenses --default-answer --confirm-command install
+          rm -Rf /tmp/InstallVulkan-${sdk_version}.app
           rm -f /tmp/vulkan-sdk.zip
 
       - name: Set up scons cache
diff --git a/gdextension/limboai.gdextension b/gdextension/limboai.gdextension
index 50915a5..40987f9 100644
--- a/gdextension/limboai.gdextension
+++ b/gdextension/limboai.gdextension
@@ -17,18 +17,18 @@ linux.debug.arm64 = "res://addons/limboai/bin/liblimboai.linux.editor.arm64.so"
 linux.release.arm64 = "res://addons/limboai/bin/liblimboai.linux.template_release.arm64.so"
 linux.debug.rv64 = "res://addons/limboai/bin/liblimboai.linux.editor.rv64.so"
 linux.release.rv64 = "res://addons/limboai/bin/liblimboai.linux.template_release.rv64.so"
-android.debug.arm64 = "res://addons/limboai/bin/liblimboai.android.template_debug.arm64.so"
+android.debug.arm64 = "res://addons/limboai/bin/liblimboai.android.editor.arm64.so"
 android.release.arm64 = "res://addons/limboai/bin/liblimboai.android.template_release.arm64.so"
-android.debug.arm32 = "res://addons/limboai/bin/liblimboai.android.template_debug.arm32.so"
+android.debug.arm32 = "res://addons/limboai/bin/liblimboai.android.editor.arm32.so"
 android.release.arm32 = "res://addons/limboai/bin/liblimboai.android.template_release.arm32.so"
-android.debug.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_debug.x86_64.so"
+android.debug.x86_64 = "res://addons/limboai/bin/liblimboai.android.editor.x86_64.so"
 android.release.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_64.so"
-android.debug.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_debug.x86_32.so"
+android.debug.x86_32 = "res://addons/limboai/bin/liblimboai.android.editor.x86_32.so"
 android.release.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_32.so"
-ios.release.arm64 = "res://addons/limboai/bin/liblimboai.ios.template_release.arm64.dylib"
 ios.debug.arm64 = "res://addons/limboai/bin/liblimboai.ios.template_debug.arm64.dylib"
-ios.release.simulator = "res://addons/limboai/bin/liblimboai.ios.template_release.universal.dylib"
+ios.release.arm64 = "res://addons/limboai/bin/liblimboai.ios.template_release.arm64.dylib"
 ios.debug.simulator = "res://addons/limboai/bin/liblimboai.ios.template_debug.universal.dylib"
+ios.release.simulator = "res://addons/limboai/bin/liblimboai.ios.template_release.universal.dylib"
 web.debug.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_debug.wasm32.wasm"
 web.release.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_release.wasm32.wasm"