chore: add Android armv7/arm64-v8a build on Qt 6.10.1 (#2892 )

* chore: add Android armv7/arm64-v8a build on Qt 6.10.1 * chore: split Qt 6.10.1/6.10.3 Android AAB by min/max SDK range * chore: bump version to 2141 * chore: drop upper SDK bound on Android 11+ AAB * fix: stage android package source snapshot after libxray.aar is copied in * chore: align Build-Android APK/AAB versionCode and naming to android11+ * chore: add x86/x86_64 APK builds to Qt 6.10.1 Android job * chore: simplify android deploy workflow * chore: add Qt 6.10.3 android9-10 APK build as fallback --------- Co-authored-by: vkamn <vk@amnezia.org>
2026-08-06 15:57:14 +03:00 · 2026-08-06 20:34:00 +08:00
7 changed files with 127 additions and 59 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -745,11 +745,37 @@ jobs:
    needs: Bake-Prebuilts-Android
    if: ${{ always() }}

+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - label: 'android9-10'
+            qt_version: '6.10.1'
+            min_sdk: 28
+            max_sdk: 29
+            version_code_offset: 0
+            build_aab: true
+          - label: 'android11+'
+            qt_version: '6.10.3'
+            min_sdk: 30
+            max_sdk: ''
+            version_code_offset: 1
+            build_aab: true
+          - label: 'android9-10-qt610-3'
+            qt_version: '6.10.3'
+            min_sdk: 28
+            max_sdk: 29
+            version_code_offset: 0
+            build_aab: false
+
    env:
-      ANDROID_PLATFORM: android-28
+      ANDROID_PLATFORM: android-${{ matrix.min_sdk }}
      NDK_VERSION: 27.0.11718014
-      QT_VERSION: 6.10.3
+      QT_VERSION: ${{ matrix.qt_version }}
      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+      APP_ANDROID_MIN_SDK: ${{ matrix.min_sdk }}
+      APP_ANDROID_MAX_SDK: ${{ matrix.max_sdk }}
+      APP_ANDROID_VERSION_CODE_OFFSET: ${{ matrix.version_code_offset }}
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      FALLBACK_S3_ENDPOINT: ${{ secrets.FALLBACK_S3_ENDPOINT }}
@@ -857,62 +883,82 @@ jobs:
        QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/android.keystore
        QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_ALIAS }}
        QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_PASS }}
+        LABEL: ${{ matrix.label }}
+        BUILD_AAB: ${{ matrix.build_aab }}
      shell: bash
      run: |
-        deploy/build.sh -t android --sign --aab
+        OUT=deploy/artifacts
+        rm -rf $OUT && mkdir -p $OUT
+
+        if [[ "$BUILD_AAB" == "true" ]]; then
+          deploy/build.sh -t android --sign --aab
+        else
+          deploy/build.sh -t android --sign
+        fi

        VERSION=$(grep CMAKE_PROJECT_VERSION:STATIC deploy/build/CMakeCache.txt | cut -d= -f2)

-        (cd deploy/build/client/android-build && mv AmneziaVPN.apk AmneziaVPN_${VERSION}_android9+_universal.apk)
-        (cd deploy/build/client/android-build/build/outputs/bundle/release && mv android-build-release.aab AmneziaVPN_${VERSION}.aab)
+        mv deploy/build/client/android-build/AmneziaVPN.apk \
+           $OUT/AmneziaVPN_${VERSION}_${LABEL}_universal.apk
+
+        if [[ "$BUILD_AAB" == "true" ]]; then
+          mv deploy/build/client/android-build/build/outputs/bundle/release/android-build-release.aab \
+             $OUT/AmneziaVPN_${VERSION}_${LABEL}.aab
+        fi

        for abi in arm64-v8a armeabi-v7a x86 x86_64; do
          deploy/build.sh -t android --sign --abi ${abi} --build ./deploy/build/${abi}
-          (cd deploy/build/${abi}/client/android-build && mv AmneziaVPN.apk AmneziaVPN_${VERSION}_android9+_${abi}.apk)
+          mv deploy/build/${abi}/client/android-build/AmneziaVPN.apk \
+             $OUT/AmneziaVPN_${VERSION}_${LABEL}_${abi}.apk
        done

+        ls -l $OUT
+
    - name: 'Upload universal APK'
      uses: actions/upload-artifact@v7
      with:
-        path: deploy/build/client/android-build/*.apk
-        archive: false
-        retention-days: 7
-
-    - name: 'Upload AAB'
-      uses: actions/upload-artifact@v7
-      with:
-        path: deploy/build/client/android-build/build/outputs/bundle/release/*.aab
+        path: deploy/artifacts/*_universal.apk
        archive: false
        retention-days: 7

    - name: 'Upload arm64-v8a APK'
      uses: actions/upload-artifact@v7
      with:
-        path: deploy/build/arm64-v8a/client/android-build/*.apk
+        path: deploy/artifacts/*_arm64-v8a.apk
        archive: false
        retention-days: 7

    - name: 'Upload armeabi-v7a APK'
      uses: actions/upload-artifact@v7
      with:
-        path: deploy/build/armeabi-v7a/client/android-build/*.apk
+        path: deploy/artifacts/*_armeabi-v7a.apk
        archive: false
        retention-days: 7

    - name: 'Upload x86 APK'
      uses: actions/upload-artifact@v7
      with:
-        path: deploy/build/x86/client/android-build/*.apk
+        path: deploy/artifacts/*_x86.apk
        archive: false
        retention-days: 7

    - name: 'Upload x86_64 APK'
      uses: actions/upload-artifact@v7
      with:
-        path: deploy/build/x86_64/client/android-build/*.apk
+        path: deploy/artifacts/*_x86_64.apk
        archive: false
        retention-days: 7

+    - name: 'Upload AAB'
+      if: ${{ matrix.build_aab }}
+      uses: actions/upload-artifact@v7
+      with:
+        path: deploy/artifacts/*.aab
+        archive: false
+        retention-days: 7
+
+# ------------------------------------------------------
+
  Extra:
    runs-on: ubuntu-latest
    steps:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

 set(PROJECT AmneziaVPN)
-set(AMNEZIAVPN_VERSION 5.0.1.0)
+set(AMNEZIAVPN_VERSION 5.0.1.1)

 set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON CACHE BOOL "" FORCE)
 set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES
@@ -28,7 +28,12 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")

 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2141)
+
+# bump by 2 on every release, because we're releasing two versions on the play store
+set(APP_ANDROID_VERSION_CODE 2142)
+if(DEFINED APP_ANDROID_VERSION_CODE_OFFSET)
+    math(EXPR APP_ANDROID_VERSION_CODE "${APP_ANDROID_VERSION_CODE} + ${APP_ANDROID_VERSION_CODE_OFFSET}")
+endif()

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
--- a/client/cmake/android.cmake
+++ b/client/cmake/android.cmake
@@ -1,6 +1,8 @@
 message("Client android ${CMAKE_ANDROID_ARCH_ABI} build")

-set(APP_ANDROID_MIN_SDK 28)
+if(NOT DEFINED APP_ANDROID_MIN_SDK)
+    set(APP_ANDROID_MIN_SDK 28)
+endif()
 set(ANDROID_PLATFORM "android-${APP_ANDROID_MIN_SDK}" CACHE STRING
    "The minimum API level supported by the application or library" FORCE)

@@ -13,7 +15,6 @@ set_target_properties(${PROJECT} PROPERTIES
    QT_ANDROID_MIN_SDK_VERSION ${APP_ANDROID_MIN_SDK}
    QT_ANDROID_TARGET_SDK_VERSION 36
    QT_ANDROID_SDK_BUILD_TOOLS_REVISION 36.0.0
-    QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android
 )

 set(QT_ANDROID_MULTI_ABI_FORWARD_VARS "QT_NO_GLOBAL_APK_TARGET_PART_OF_ALL;CMAKE_BUILD_TYPE")
@@ -53,3 +54,27 @@ file(COPY ${AMNEZIA_LIBXRAY_PATH} DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/androi
 find_package(openvpn-pt-android REQUIRED)
 set(LIBS ${LIBS} amnezia::openvpn-pt-android)
 set_property(TARGET ${PROJECT} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS ${OPENVPN_PT_ANDROID_LIBCK_OVPN_PLUGIN_PATH})
+
+set(APP_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android)
+
+if(APP_ANDROID_MAX_SDK)
+    set(APP_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/android-package-source)
+    file(REMOVE_RECURSE ${APP_ANDROID_PACKAGE_SOURCE_DIR})
+    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/android/ DESTINATION ${APP_ANDROID_PACKAGE_SOURCE_DIR})
+
+    set(manifest_path ${APP_ANDROID_PACKAGE_SOURCE_DIR}/AndroidManifest.xml)
+    set(manifest_anchor "android:installLocation=\"auto\">")
+    file(READ ${manifest_path} manifest_contents)
+    string(REPLACE
+        "${manifest_anchor}"
+        "${manifest_anchor}\n\n    <uses-sdk android:maxSdkVersion=\"${APP_ANDROID_MAX_SDK}\" />"
+        patched_contents "${manifest_contents}")
+    if(patched_contents STREQUAL manifest_contents)
+        message(FATAL_ERROR
+            "Failed to set maxSdkVersion=${APP_ANDROID_MAX_SDK}: anchor '${manifest_anchor}' "
+            "not found in ${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml")
+    endif()
+    file(WRITE ${manifest_path} "${patched_contents}")
+endif()
+
+set_property(TARGET ${PROJECT} PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${APP_ANDROID_PACKAGE_SOURCE_DIR})
--- a/client/ui/controllers/selfhosted/installUiController.cpp
+++ b/client/ui/controllers/selfhosted/installUiController.cpp
@@ -567,12 +567,12 @@ void InstallUiController::clearProcessedServerCredentials()

 void InstallUiController::setProcessedServerCredentials(const QString &hostName, const QString &userName, const QString &secretData)
 {
-    m_processedServerCredentials.hostName = hostName.trimmed();
+    m_processedServerCredentials.hostName = hostName;
    if (m_processedServerCredentials.hostName.contains(":")) {
        m_processedServerCredentials.port = m_processedServerCredentials.hostName.split(":").at(1).toInt();
        m_processedServerCredentials.hostName = m_processedServerCredentials.hostName.split(":").at(0);
    }
-    m_processedServerCredentials.userName = userName.trimmed();
+    m_processedServerCredentials.userName = userName;
    m_processedServerCredentials.secretData = secretData;
 }

--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -65,18 +65,15 @@ PageType {
                headerText: title
                textField.echoMode: hideContent ? TextInput.Password : TextInput.Normal
                textField.placeholderText: placeholderContent
+                textField.text: textField.text

-                rightButtonClickedOnEnter: false
+                rightButtonClickedOnEnter: true

                clickedFunc: function () {
-                    if (clickedHandler) {
-                        clickedHandler()
-                        buttonImageSource = textField.text !== "" ? imageSource : ""
-                    }
+                    clickedHandler()
+                    buttonImageSource = textField.text !== "" ? imageSource : ""
                }

-                textField.onAccepted: root.submit()
-
                textField.onFocusChanged: {
                    textField.text = textField.text.replace(/^\s+|\s+$/g, '')
                }
@@ -115,7 +112,25 @@ PageType {
                text: qsTr("Continue")

                clickedFunc: function() {
-                    root.submit()
+                    if (!root.isCredentialsFilled()) {
+                        return
+                    }
+
+                    var _hostname = listView.itemAtIndex(vars.hostnameIndex).children[0].textField.text
+                    var _username = listView.itemAtIndex(vars.usernameIndex).children[0].textField.text
+                    var _secretData = listView.itemAtIndex(vars.secretDataIndex).children[0].textField.text
+
+                    InstallController.setProcessedServerCredentials(_hostname, _username, _secretData)
+                    ServersUiController.setProcessedServerId("")
+
+                    PageController.showBusyIndicator(true)
+                    var isConnectionOpened = InstallController.checkSshConnection()
+                    PageController.showBusyIndicator(false)
+                    if (!isConnectionOpened) {
+                        return
+                    }
+
+                    PageController.goToPage(PageEnum.PageSetupWizardEasy)
                }
            }

@@ -153,28 +168,6 @@ PageType {
        }
    }

-    function submit() {
-        if (!root.isCredentialsFilled()) {
-            return
-        }
-
-        var _hostname = listView.itemAtIndex(vars.hostnameIndex).children[0].textField.text
-        var _username = listView.itemAtIndex(vars.usernameIndex).children[0].textField.text
-        var _secretData = listView.itemAtIndex(vars.secretDataIndex).children[0].textField.text
-
-        InstallController.setProcessedServerCredentials(_hostname, _username, _secretData)
-        ServersUiController.setProcessedServerId("")
-
-        PageController.showBusyIndicator(true)
-        var isConnectionOpened = InstallController.checkSshConnection()
-        PageController.showBusyIndicator(false)
-        if (!isConnectionOpened) {
-            return
-        }
-
-        PageController.goToPage(PageEnum.PageSetupWizardEasy)
-    }
-
    function isCredentialsFilled() {
        var hasEmptyField = false

--- a/deploy/build.sh
+++ b/deploy/build.sh
@@ -123,7 +123,7 @@ case "$TARGET" in
    android)
        no_installers=1
        : ${CMAKE_GENERATOR:="Ninja"}
-        : ${ANDROID_PLATFORM:="android-28"}
+        : ${ANDROID_PLATFORM:="android-${APP_ANDROID_MIN_SDK:-28}"}

        if [[ -n "$SIGN" ]]; then
            QT_ANDROID_SIGN_APK=TRUE
@@ -198,6 +198,9 @@ args=()
 [[ -n "$ANDROID_SDK_ROOT" ]]          && args+=("-DANDROID_SDK_ROOT=$ANDROID_SDK_ROOT")
 [[ -n "$ANDROID_NDK_ROOT" ]]          && args+=("-DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT")
 [[ -n "$ANDROID_PLATFORM" ]]          && args+=("-DANDROID_PLATFORM=$ANDROID_PLATFORM")
+[[ -n "$APP_ANDROID_MIN_SDK" ]]       && args+=("-DAPP_ANDROID_MIN_SDK=$APP_ANDROID_MIN_SDK")
+[[ -n "$APP_ANDROID_MAX_SDK" ]]       && args+=("-DAPP_ANDROID_MAX_SDK=$APP_ANDROID_MAX_SDK")
+[[ -n "$APP_ANDROID_VERSION_CODE_OFFSET" ]] && args+=("-DAPP_ANDROID_VERSION_CODE_OFFSET=$APP_ANDROID_VERSION_CODE_OFFSET")
 [[ -n "$QT_ANDROID_SIGN_APK" ]]       && args+=("-DQT_ANDROID_SIGN_APK=$QT_ANDROID_SIGN_APK")
 [[ -n "$QT_ANDROID_SIGN_AAB" ]]       && args+=("-DQT_ANDROID_SIGN_AAB=$QT_ANDROID_SIGN_AAB")
 [[ -n "$QT_ANDROID_ABIS" ]]           && args+=("-DQT_ANDROID_ABIS=$QT_ANDROID_ABIS")
--- a/deploy/deploy_s3.sh
+++ b/deploy/deploy_s3.sh
@@ -34,10 +34,6 @@ download_file() {
    echo "Successfully downloaded $filename"
 }

-download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android9+_arm64-v8a.apk
-download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android9+_armeabi-v7a.apk
-download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android9+_x86.apk
-download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_android9+_x86_64.apk
 download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_linux_x64.run
 download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_macos_x64.pkg
 download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/AmneziaVPN_${VERSION}_windows_x64.exe