From af980b4117f280012c26067ebcfd8402828b6429 Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Tue, 3 Mar 2026 16:07:24 +0000
Subject: [PATCH] Remove `_android` suffix from Android libretro core filename

---
 .github/workflows/libretro.yml    | 2 +-
 .gitlab-ci.yml                    | 4 ++++
 src/citra_libretro/CMakeLists.txt | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/libretro.yml b/.github/workflows/libretro.yml
index 30f105e33..457056213 100644
--- a/.github/workflows/libretro.yml
+++ b/.github/workflows/libretro.yml
@@ -41,7 +41,7 @@ jobs:
           export NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/$ANDROID_NDK_VERSION
           ${ANDROID_SDK_ROOT}/cmake/3.30.3/bin/cmake $CORE_ARGS -DANDROID_PLATFORM=android-$API_LEVEL -DCMAKE_TOOLCHAIN_FILE=$NDK_ROOT/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static -DANDROID_ABI=$ANDROID_ABI . -B $BUILD_DIR
           ${ANDROID_SDK_ROOT}/cmake/3.30.3/bin/cmake --build $BUILD_DIR --target azahar_libretro --config Release -j $(nproc)
-          zip -j -9 azahar-libretro-android-arm64.zip ${{ env.BUILD_DIR }}/${{ env.EXTRA_PATH }}/azahar_libretro_android.*
+          zip -j -9 azahar-libretro-android-arm64.zip ${{ env.BUILD_DIR }}/${{ env.EXTRA_PATH }}/azahar_libretro.*
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64cafa617..41473e9a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,6 +104,10 @@ android-arm64-v8a:
   variables:
     ANDROID_NDK_VERSION: 26.2.11394342
     NDK_ROOT: /android-sdk-linux/ndk/$ANDROID_NDK_VERSION
+    LIBNAME: ${CORENAME}_libretro.so
+  artifacts:
+    paths:
+      - $LIBNAME
 
 # iOS arm64
 libretro-build-ios-arm64:
diff --git a/src/citra_libretro/CMakeLists.txt b/src/citra_libretro/CMakeLists.txt
index d90709f36..cd2f6baaf 100644
--- a/src/citra_libretro/CMakeLists.txt
+++ b/src/citra_libretro/CMakeLists.txt
@@ -71,7 +71,6 @@ if(ANDROID)
   target_link_libraries(azahar_libretro PRIVATE libretro_common)
   # Link Android log library for __android_log_print
   target_link_libraries(azahar_libretro PRIVATE log)
-  set_target_properties(azahar_libretro PROPERTIES SUFFIX "_android.so")
 endif()
 
 if(MINGW)