[Android] buildsystem: group the non valid ANDROID_ABI name handling

[Steve Lhomme]

vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jun 13 13:33:58 2025 +0200| [79be47ac9eae0821e0b07336049d294c1281c247] | committer: Steve Lhomme

buildsystem: group the non valid ANDROID_ABI name handling

So the other if/else section is setting the same variables in each case.

> https://code.videolan.org/videolan/vlc-android/commit/79be47ac9eae0821e0b07336049d294c1281c247
---

 buildsystem/compile.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index ccb4f2e4d8..7dde91d3cf 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -121,15 +121,17 @@ fi
 if [ -z "$ANDROID_ABI" ]; then
    diagnostic "*** No ANDROID_ABI defined architecture: using arm64-v8a"
    ANDROID_ABI="arm64-v8a"
+elif [ "$ANDROID_ABI" = "arm64" ]; then
+    ANDROID_ABI="arm64-v8a"
+elif [ "$ANDROID_ABI" = "arm" ]; then
+    ANDROID_ABI="armeabi-v7a"
 fi
 
-if [ "$ANDROID_ABI" = "armeabi-v7a" ] || [ "$ANDROID_ABI" = "arm" ]; then
-    ANDROID_ABI="armeabi-v7a"
+if [ "$ANDROID_ABI" = "armeabi-v7a" ]; then
     GRADLE_ABI="ARMv7"
     ARCH="arm"
     TRIPLET="arm-linux-androideabi"
-elif [ "$ANDROID_ABI" = "arm64-v8a" ] || [ "$ANDROID_ABI" = "arm64" ]; then
-    ANDROID_ABI="arm64-v8a"
+elif [ "$ANDROID_ABI" = "arm64-v8a" ]; then
     GRADLE_ABI="ARMv8"
     ARCH="arm64"
     TRIPLET="aarch64-linux-android"