more work on android

Author: PeterPetrik

.github/workflows/android.yml

@@ -213,21 +213,16 @@ jobs:
 
             cmake \
               -DCMAKE_BUILD_TYPE=Release \
-              -D ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT} \
-              -D ANDROID_NDK_VERSION="${ANDROID_NDK_VERSION}" \
-              -D ANDROID_BUILD_TOOLS_VERSION="${ANDROID_BUILD_TOOLS_VERSION}" \
+              -DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT} \
+              -DANDROID_NDK_VERSION="${ANDROID_NDK_VERSION}" \
+              -DANDROID_BUILD_TOOLS_VERSION="${ANDROID_BUILD_TOOLS_VERSION}" \
               -DVCPKG_HOST_TRIPLET=arm64-osx \
-              -D VCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
-              -D VCPKG_INSTALL_OPTIONS="--allow-unsupported" \
+              -DVCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
+              -DVCPKG_INSTALL_OPTIONS="--allow-unsupported" \
               -DANDROID_ARM_NEON=ON \
               -DANDROID_ABI=${{ matrix.ANDROID_ABI }} \
               -DQT_ANDROID_ABIS=${{ matrix.ANDROID_ABI }} \
-              -DANDROIDAPI=${ANDROIDAPI} \
-              -DANDROID_PLATFORM=android-${ANDROIDAPI} \
-              -DANDROID_NDK_PLATFORM=android-${ANDROIDAPI} \
-              -DANDROID_STL="c++_shared" \
               -DQT_ANDROID_SIGN_APK=Yes \
-              -DQT_ANDROID_SIGN_AAB=Yes \
               -DUSE_MM_SERVER_API_KEY=Yes \
               -DUSE_KEYCHAIN=No \
               -DCMAKE_TOOLCHAIN_FILE:PATH="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" \
@@ -259,29 +254,3 @@ jobs:
           path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.apk
           name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} APK [v7 + v8a]
 
-      - name: Build AAB
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
-        env:
-          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
-          ANDROID_NDK_HOST: darwin-x86_64
-          QT_BASE: ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}
-        run: |
-            cd ${{ github.workspace }}/build-Input
-            ninja aab
-
-            echo "AAB:"
-            find . | grep .aab
-
-      - name: Rename AAB artefacts
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
-        run: |
-          mv \
-            ${{ github.workspace }}/build-mm/app/android-build/build/outputs/bundle/release/android-build-release.aab \
-            ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab
-
-      - name: Upload AAB to Artifacts
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
-        uses: actions/upload-artifact@v4
-        with:
-          path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab
-          name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} AAB

CMakeLists.txt

@@ -15,15 +15,10 @@ if (ANDROID_ABI)
   # Workaround for bug https://bugreports.qt.io/browse/QTBUG-112885 in Qt6.5.0
   # set(QT_NO_COLLECT_IMPORTED_TARGET_APK_DEPS TRUE)
 
-  if (DEFINED ENV{ANDROIDAPI})
-    set(ANDROIDAPI $ENV{ANDROIDAPI})
-  else ()
-    message(FATAL_ERROR "ANDROIDAPI not defined as env variable")
-  endif ()
-  # set(ANDROIDAPI "28")
+  set(ANDROIDAPI "28") # when changed change VCPKG_CMAKE_SYSTEM_VERSION in triplets *-android.cmake
 
-  set(ANDROID_PLATFORM "android-${ANDROIDAPI}")
-  set(ANDROID_NDK_PLATFORM "android-${ANDROIDAPI}")
+  set(ANDROID_PLATFORM "android-${ANDROIDAPI}") # when changed change VCPKG_CMAKE_SYSTEM_VERSION in triplets *-android.cmake
+  set(ANDROID_NDK_PLATFORM "android-${ANDROIDAPI}") # when changed change VCPKG_CMAKE_SYSTEM_VERSION in triplets *-android.cmake
   set(ANDROID_STL "c++_shared")
 
   # Target/Minimum API levels for Android, used as Input target properties
@@ -33,6 +28,7 @@ if (ANDROID_ABI)
   if (NOT INPUT_ANDROID_NDK_PATH)
     message(FATAL_ERROR "Set required environment variable ANDROID_NDK_ROOT.")
   endif ()
+
 endif ()
 
 if (IOS)
@@ -41,11 +37,11 @@ if (IOS)
   set(PLATFORM "OS")
   set(ENABLE_ARC FALSE)
   set(ENABLE_BITCODE FALSE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "16.0") #when changed change triplets arm64-ios.cmake
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "16.0") # when changed change triplets arm64-ios.cmake
 endif ()
 
 if (APPLE AND NOT IOS)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") #when changed change also triplets x64/arm64-osx.cmake
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") # when changed change also triplets *-osx.cmake
 endif ()
 
 # ########################################################################################

INSTALL.md

@@ -268,46 +268,42 @@ For building ABIs see https://www.qt.io/blog/android-multi-abi-builds-are-back
 
 
 ```
-  ANDROIDAPI=24
   PATH=+/opt/homebrew/bin
   PATH=+/opt/homebrew/Cellar/flex/2.6.4_2/bin
   PATH=+/opt/homebrew/Cellar/bison/3.8.2/bin
   PATH=+/Users/peterpetrik/Projects/quick/build/vcpkg
-  DEPLOYMENT_TARGET=11.0
   ANDROID_NDK_HOME=/Users/peterpetrik/Library/Android/sdk/ndk/26.1.10909125
 ``` 
 
   You can continue with configure step:
 ```
   cmake \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DCMAKE_BUILD_TYPE
     -DANDROID_ABI=arm64-v8a \
+    -DVCPKG_HOST_TRIPLET=arm64-osx \
+    -DVCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
     -DANDROID_NDK=/Users/peterpetrik/Library/Android/sdk/ndk/26.1.10909125 \ 
     -DANDROID_PLATFORM=android-24 \
     -DANDROID_SDK_ROOT=/Users/peterpetrik/Library/Android/sdk \
     -DANDROID_NDK_VERSION="r26" \
     -DANDROID_BUILD_TOOLS_VERSION="34.0.0" \
-    -DVCPKG_HOST_TRIPLET=arm64-osx \
-    -DVCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
-              -D VCPKG_INSTALL_OPTIONS="--allow-unsupported" \
-              -DANDROID_ARM_NEON=ON \
-              -DANDROID_ABI=${{ matrix.ANDROID_ABI }} \
-              -DQT_ANDROID_ABIS=${{ matrix.ANDROID_ABI }} \
-              -DANDROIDAPI=${ANDROIDAPI} \
-              -DANDROID_PLATFORM=android-${ANDROIDAPI} \
-              -DANDROID_NDK_PLATFORM=android-${ANDROIDAPI} \
-              -DANDROID_STL="c++_shared" \
-              -DQT_ANDROID_SIGN_APK=Yes \
-              -DQT_ANDROID_SIGN_AAB=Yes \
-              -DUSE_MM_SERVER_API_KEY=Yes \
-              -DUSE_KEYCHAIN=No \
-              -DCMAKE_TOOLCHAIN_FILE:PATH="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" \
-              -GNinja \
-              -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-              -S ../mobile \
-              -B ./
-
+    -D VCPKG_INSTALL_OPTIONS="--allow-unsupported" \
+    -DANDROID_ARM_NEON=ON \
+    -DANDROID_ABI=${{ matrix.ANDROID_ABI }} \
+    -DQT_ANDROID_ABIS=${{ matrix.ANDROID_ABI }} \
+    -DANDROIDAPI=${ANDROIDAPI} \
+    -DANDROID_PLATFORM=android-${ANDROIDAPI} \
+    -DANDROID_NDK_PLATFORM=android-${ANDROIDAPI} \
+    -DANDROID_STL="c++_shared" \
+    -DQT_ANDROID_SIGN_APK=Yes \
+    -DQT_ANDROID_SIGN_AAB=Yes \
+    -DUSE_MM_SERVER_API_KEY=Yes \
+    -DUSE_KEYCHAIN=No \
+    -DCMAKE_TOOLCHAIN_FILE:PATH="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" \
+    -GNinja \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -S ../mobile \
+    -B ./
 ```
 
 ## 4.3. Android on Windows

vcpkg.json

@@ -81,6 +81,7 @@
         "qtconnectivity",
         "qtdeclarative",
         "qtimageformats",
+        "qtnetworkauth",
         "qtlocation",
         {
           "name": "qtmultimedia",

vcpkg/triplets/arm-android.cmake

@@ -7,15 +7,14 @@ set(VCPKG_BUILD_TYPE release)
 # Note to myself and others: this is correct even on macOS host
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi")
 
-
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON)
 
-if(DEFINED ENV{ANDROIDAPI})
-  set(VCPKG_CMAKE_SYSTEM_VERSION $ENV{ANDROIDAPI})
-else()
-  message(FATAL_ERROR "ANDROIDAPI not defined as env variable")
-endif()
-
+set(ANDROIDAPI "28") # when changed change CMakeLists.cmake
+set(ANDROID_PLATFORM "android-${ANDROIDAPI}")
+set(ANDROID_NDK_PLATFORM "android-${ANDROIDAPI}")
+set(VCPKG_CMAKE_SYSTEM_VERSION "${ANDROIDAPI}")
+set(ANDROID_STL "c++_shared")
+ 
 set(VCPKG_CXX_FLAGS "-fstack-protector-strong")
 set(VCPKG_C_FLAGS "-fstack-protector-strong")
 set(VCPKG_LINKER_FLAGS "-lunwind -Wl,--exclude-libs=libunwind.a")

vcpkg/triplets/arm64-android.cmake

@@ -9,12 +9,11 @@ set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android")
 
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=arm64-v8a)
 
-set(VCPKG_CXX_FLAGS "-fstack-protector-strong")
-set(VCPKG_C_FLAGS "-fstack-protector-strong")
-
-if(DEFINED ENV{ANDROIDAPI})
-  set(VCPKG_CMAKE_SYSTEM_VERSION $ENV{ANDROIDAPI})
-else()
-    message(FATAL_ERROR "$ENV{ANDROIDAPI} not defined as env variable")
-endif()
+set(ANDROIDAPI "28") # when changed change CMakeLists.cmake
+set(ANDROID_PLATFORM "android-${ANDROIDAPI}")
+set(ANDROID_NDK_PLATFORM "android-${ANDROIDAPI}")
+set(VCPKG_CMAKE_SYSTEM_VERSION "${ANDROIDAPI}")
+set(ANDROID_STL "c++_shared")
 
+set(VCPKG_CXX_FLAGS "-fstack-protector-strong")
+set(VCPKG_C_FLAGS "-fstack-protector-strong")