ci: refactor Jenkinsfile.android

Author: siddarthkay

ci/Jenkinsfile.android

@@ -16,11 +16,6 @@ pipeline {
   }
 
   parameters {
-    choice(
-      name: 'ARCH',
-      description: 'Target architecture',
-      choices: ['arm64', 'x86_64']
-    )
     booleanParam(
       name: 'RELEASE',
       description: 'Decides whether release credentials are used.',
@@ -46,49 +41,70 @@ pipeline {
   }
 
   environment {
+    /* Architecture */
+    ARCH = "arm64"
+    OS = "android"
+
+    /* Build system */
     USE_SYSTEM_NIM = "1"
+
+    /* Cache directories */
     GOCACHE = "/tmp/go-cache"
     GOMODCACHE = "/tmp/go-mod-cache"
     GOTMPDIR = "/tmp"
-    STATUS_APK_ARTIFACT = "pkg/Status-tablet-${BUILD_NUMBER}.apk"
-    PLATFORM = "android/${ARCH}"
+    NIMCACHE = "/tmp/nim-cache"
+
+    /* Platform and artifacts */
+    PLATFORM = "android/arm64"
+    STATUS_APK_ARTIFACT = "pkg/Status-tablet-arm64-${BUILD_NUMBER}.apk"
+    STATUS_APK = "${WORKSPACE}/mobile/bin/android/arm64/qt6/Status-tablet.apk"
+
+    /* Android SDK/NDK paths */
+    ANDROID_SDK_ROOT = "/opt/android-sdk"
+    ANDROID_NDK_ROOT = "/opt/android-ndk"
+
+    /* Qt paths */
+    QT_BASE_PATH = "/opt/qt/6.9.0"
+    QT_HOST_PATH = "/opt/qt/6.9.0/gcc_64"
+    QT_ANDROID_PATH = "/opt/qt/6.9.0/android_arm64_v8a"
+
+    /* Build configuration */
+    PKG_CONFIG_PATH = "/opt/qt/6.9.0/android_arm64_v8a/lib/pkgconfig"
+    PATH = "/opt/qt/6.9.0/android_arm64_v8a/bin:/opt/qt/6.9.0/gcc_64/bin:/opt/qt/6.9.0/gcc_64/libexec:/opt/qt/6.9.0/android_arm64_v8a/libexec:/opt/android-sdk/emulator:/opt/android-sdk/tools:/opt/android-sdk/tools/bin:/opt/android-sdk/platform-tools:${PATH}"
   }
 
   stages {
     stage('Prepare') {
       steps {
         sh 'git submodule update --init --recursive'
-        script {
-          def qtPath = getQtAndroidPath(params.ARCH)
-          env.QT_ANDROID_PATH = qtPath
-          env.STATUS_APK = "${env.WORKSPACE}/mobile/bin/android/qt6/Status-tablet.apk"
-
-          echo "Building for architecture: ${params.ARCH}"
-          echo "Qt Android path: ${qtPath}"
-        }
       }
     }
 
     stage('Build Android APK') {
       steps {
         sh """
-          export ARCH="${params.ARCH}"
-          export PKG_CONFIG_PATH="${env.QT_ANDROID_PATH}/lib/pkgconfig"
-          export PATH="${env.QT_ANDROID_PATH}/bin:/opt/qt/6.9.0/gcc_64/bin:/opt/qt/6.9.0/gcc_64/libexec:${env.QT_ANDROID_PATH}/libexec:/opt/android-sdk/emulator:/opt/android-sdk/tools:/opt/android-sdk/tools/bin:/opt/android-sdk/platform-tools:${env.PATH}"
+          set -e
+
+          echo "Cleaning previous build..."
           make mobile-clean
-          make -j${utils.getProcCount()} mobile-build V=3 USE_SYSTEM_NIM=1
+
+          echo "Building APK..."
+          make -j${utils.getProcCount()} mobile-build V=3
         """
       }
     }
 
     stage('Package APK') {
       steps {
         sh """
+          set -e
+
           mkdir -p pkg
           cp '${env.STATUS_APK}' '${env.STATUS_APK_ARTIFACT}'
-          ls -la '${env.STATUS_APK_ARTIFACT}'
+
+          echo "APK packaged successfully:"
+          ls -lah '${env.STATUS_APK_ARTIFACT}'
         """
-        echo "APK packaged: ${env.STATUS_APK_ARTIFACT}"
       }
     }
 
@@ -99,6 +115,7 @@ pipeline {
             script {
               env.PKG_URL = s5cmd.upload(env.STATUS_APK_ARTIFACT)
               jenkins.setBuildDesc(APK: env.PKG_URL)
+              echo "Upload complete: ${env.PKG_URL}"
             }
           }
         }
@@ -117,14 +134,3 @@ pipeline {
       cleanup { sh './scripts/clean-git.sh' }
   }
 }
-
-def getQtAndroidPath(architecture) {
-  switch(architecture) {
-    case 'arm64':
-      return '/opt/qt/6.9.0/android_arm64_v8a'
-    case 'x86_64':
-      return '/opt/qt/6.9.0/android_x86_64'
-    default:
-      return '/opt/qt/6.9.0/android_arm64_v8a'
-  }
-}