From ec56f84f9ae58447783cd2be37e28fb69f8fbb49 Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Sun, 5 May 2024 18:39:02 +0200
Subject: [PATCH] build: fix Android ARM64 build

---
 .github/workflows/build.yml | 24 +++++++++++++-----------
 src/CMakeLists.txt          |  3 +++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af9b3f608..8672e0ae9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -579,31 +579,33 @@ jobs:
         QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/release.jks
         QT_ANDROID_KEYSTORE_ALIAS: release
         QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+        Qt6_DIR_HOST: ${{ env.Qt6_DIR }}/../gcc_64
+        Qt6_DIR_V7: ${{ env.Qt6_DIR }}/../android_armv7
+        Qt6_DIR_V8: ${{ env.Qt6_DIR }}/../android_arm64_v8a
       run: |
         mkdir build
         cd build
+        export Qt6_DIR=Qt6_DIR_V7
         export ANDROID_SDK_ROOT=$ANDROID_HOME
         export ANDROID_NDK_ROOT="${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}"
         cmake ../src -DCMAKE_BUILD_TYPE=Release -DNIGHTLY=$GRABBER_IS_NIGHTLY -DCOMMIT="$GITHUB_SHA" -DVERSION="$GRABBER_VERSION" \
           -DANDROID_ABI:STRING=armeabi-v7a \
           -DQT_ANDROID_ABIS:STRING="armeabi-v7a;arm64-v8a" \
-          -DQT_PATH_ANDROID_ABI_armeabi-v7a:PATH=$Qt6_DIR/../android_armv7 \
-          -DQT_PATH_ANDROID_ABI_arm64-v8a:PATH=$Qt6_DIR/../android_arm64_v8a \
+          -DQT_PATH_ANDROID_ABI_armeabi-v7a:PATH=$Qt6_DIR_V7 \
+          -DQT_PATH_ANDROID_ABI_arm64-v8a:PATH=$Qt6_DIR_V8 \
           -DANDROID_NATIVE_API_LEVEL:STRING=21 \
           -DANDROID_NDK:PATH=$ANDROID_NDK_ROOT \
           -DANDROID_SDK:PATH=$ANDROID_HOME \
-          -DQT_ANDROID_NDK_ROOT:PATH=$ANDROID_NDK_ROOT \
-          -DQT_ANDROID_SDK_ROOT:PATH=$ANDROID_HOME \
           -DANDROID_STL:STRING=c++_shared \
-          -DQT_HOST_PATH:STRING=$Qt6_DIR/../gcc_64 \
+          -DQT_HOST_PATH:STRING=$Qt6_DIR_HOST \
+          -DQT_HOST_PATH_CMAKE_DIR:STRING=$Qt6_DIR_HOST/lib/cmake \
           -DCMAKE_CXX_COMPILER:STRING=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
           -DCMAKE_C_COMPILER:STRING=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
-          -DCMAKE_FIND_ROOT_PATH:STRING=$Qt6_DIR/lib/cmake \
-          -DCMAKE_PREFIX_PATH:STRING=$Qt6_DIR \
-          -DCMAKE_MODULE_PATH:STRING="$Qt6_DIR/lib/cmake;$Qt6_DIR/../gcc_64/lib/cmake" \
-          -DCMAKE_TOOLCHAIN_FILE:PATH=$Qt6_DIR/lib/cmake/Qt6/qt.toolchain.cmake \
-          -DQT_QMAKE_EXECUTABLE:STRING=$Qt6_DIR/bin/qmake \
-          -DQt6LinguistTools_DIR="$Qt6_DIR/../gcc_64/lib/cmake/Qt6LinguistTools"
+          -DCMAKE_FIND_ROOT_PATH:STRING=$Qt6_DIR_V7 \
+          -DCMAKE_PREFIX_PATH:STRING=$Qt6_DIR_V7 \
+          -DCMAKE_TOOLCHAIN_FILE:PATH=$Qt6_DIR_V7/lib/cmake/Qt6/qt.toolchain.cmake \
+          -DQT_DEBUG_FIND_PACKAGE=ON \
+          -DQT_QMAKE_EXECUTABLE:STRING=$Qt6_DIR_V7/bin/qmake
         cmake --build . --config Release --target sites
         cmake --build . --config Release --target gui-qml_make_apk
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2dcffd766..d678dc29a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -60,6 +60,9 @@ set(ANDROID_APP_NAME ${PROJECT_NAME})
 set(ANDROID_APP_VERSION_NAME ${VERSION})
 set(ANDROID_APP_VERSION_CODE 1)
 set(ANDROID_APP_PACKAGE_NAME "org.bionus.grabber")
+if(ANDROID AND NOT CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
+	set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
+endif()
 
 message(STATUS "Configuring for version '${VERSION}'")
 message(STATUS "Configuring for platform '${VERSION_PLATFORM}' (${CMAKE_SYSTEM_PROCESSOR})")