From 453fc0d8af690df9a41218017b48090e871cce89 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Fri, 31 Oct 2025 15:07:45 +1000 Subject: [PATCH] cmake: Fix Android external download URL to use main branch The fix simplifies the logic to always use the main branch for Android builds, since architecture is already encoded in the package filenames. Signed-off-by: Zephyron --- CMakeModules/DownloadExternals.cmake | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index ddddd2a6b..494b6f925 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -19,19 +19,9 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(package_repo "ext-linux-bin/raw/branch/main/") set(package_extension ".tar.xz") elseif (ANDROID) - # Select Android branch based on ABI; default to main if unknown - if (DEFINED ANDROID_ABI) - if (ANDROID_ABI STREQUAL "arm64-v8a") - set(_android_branch "arm64") - elseif (ANDROID_ABI STREQUAL "x86_64") - set(_android_branch "x86_64") - else() - set(_android_branch "main") - endif() - else() - set(_android_branch "main") - endif() - set(package_repo "ext-android-bin/raw/branch/${_android_branch}/") + # All Android binaries are on the main branch + # Files are named with architecture suffix (e.g., ffmpeg-android-v5.1.LTS-aarch64.tar.xz) + set(package_repo "ext-android-bin/raw/branch/main/") set(package_extension ".tar.xz") else() message(FATAL_ERROR "No package available for this platform")